From 228e3db731464f21718f7e531878b438910916fc Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 16 Feb 2012 14:34:06 -0800
Subject: [PATCH] A change that might have a conflict.

---
 README.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index f523e5bce..a0eb3aeff 100644
--- a/README.txt
+++ b/README.txt
@@ -11,4 +11,6 @@ Features
 Contact & Support
 Training
 GitHub Enterprise
-Site Status
\ No newline at end of file
+Site Status
+
+Another change using SmartGit client.
\ No newline at end of file
-- 
2.47.3