Another test for merging github and offocial documentation repo.

diff --git a/README b/README
index 68bfd7d..b51bfc4 100644 (file)
--- 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 .