From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Tue, 17 May 2011 12:30:55 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b48ef76900711198b4028c26ef2c0d99c6d5b837;p=Evergreen-DocBook.git

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

Conflicts:
	README
---

b48ef76900711198b4028c26ef2c0d99c6d5b837
diff --cc README
index b51bfc4,35cf1a7..0014c0c
--- a/README
+++ b/README
@@@ -1,4 -1,9 +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