]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 228e3db 09da8af)
Merge branch 'master' of github.com:collectionspace/services
authorRichard Millet <remillet@berkeley.edu>
Thu, 16 Feb 2012 22:44:14 +0000 (14:44 -0800)
committerRichard Millet <remillet@berkeley.edu>
Thu, 16 Feb 2012 22:44:14 +0000 (14:44 -0800)
Conflicts:
README.txt

1  2 
README.txt patch | diff1 | diff2 | blob | history

diff --cc README.txt
index a0eb3aeff61d5aad5ca32624417c82bf14164211,1241c2870e8aa149c947d06cf8b036c89aa89437..8a36256fc494ac426333921459d9ebba3ac88207
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -13,4 -13,4 +13,5 @@@ Trainin
  GitHub Enterprise
  Site Status
  
 -The quick brown fox jumped over the lazy dog.
++The quick brown fox jumped over the lazy dog.
 +Another change using SmartGit client.