Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Mon, 16 May 2011 16:15:29 +0000 (12:15 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Mon, 16 May 2011 16:15:29 +0000 (12:15 -0400)
Conflicts:
README

README

diff --git a/README b/README
index 68bfd7d..35cf1a7 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,9 @@
 <<<<<<< 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
+test edit.
+edited from clone of official.
+=======
 edited from github.
+>>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af