From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 16 Feb 2012 22:34:06 +0000 (-0800)
Subject: A change that might have a conflict.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=228e3db731464f21718f7e531878b438910916fc;p=tmp%2Fjakarta-migration.git

A change that might have a conflict.
---

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