From: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 16 May 2011 16:12:09 +0000 (-0700)
Subject: Another test for merging github and offocial documentation repo.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0f0de211caa4c0b0bdefdb8f0466f0a628654038;p=evergreen%2Fmasslnc.git

Another test for merging github and offocial documentation repo.
---

diff --git a/README b/README
index 68bfd7d9ba..b51bfc49ce 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
 <<<<<<< HEAD
 This is the documentation for the Evergreen Open-ILS project. It is maintained by DIG volunteers. For the published documentation, visit: http://docs.evergreen-ils.org
 
-edited from github.
+edited from github #2 .