]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79b1387)
A change that might have a conflict.
authorRichard Millet <remillet@berkeley.edu>
Thu, 16 Feb 2012 22:34:06 +0000 (14:34 -0800)
committerRichard Millet <remillet@berkeley.edu>
Thu, 16 Feb 2012 22:34:06 +0000 (14:34 -0800)
README.txt patch | blob | history

diff --git a/README.txt b/README.txt
index f523e5bce15d4d51844a6a8e5b011824b5a5558b..a0eb3aeff61d5aad5ca32624417c82bf14164211 100644 (file)
--- 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