From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Mon, 16 May 2011 16:15:29 +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=7cd9a824f0eadc452751af29cadaed766ae819ff;p=contrib%2FConifer.git

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

Conflicts:
	README
---

7cd9a824f0eadc452751af29cadaed766ae819ff
diff --cc README
index 7b44139f02,68bfd7d9ba..35cf1a7754
--- a/README
+++ b/README
@@@ -1,5 -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