Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook

[Evergreen-DocBook.git] / README

diff --git a/README b/README
index b51bfc4..0014c0c 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,13 @@
 <<<<<<< 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
 
+<<<<<<< HEAD
 edited from github #2 .
+=======
+<<<<<<< HEAD
+test edit.
+edited from clone of official.
+=======
+edited from github.
+>>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af
+>>>>>>> 01f1cae45e26b13819546131fd5a57181e656bbb