From: rsoulliere <robert.soulliere@mohawkcollege.ca>
Date: Sat, 14 May 2011 21:56:12 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
X-Git-Url: http://git.equinoxoli.org/?p=Evergreen-DocBook.git;a=commitdiff_plain;h=708bc148d1a7d798fc757bb3b917cb8ee058690b

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

Conflicts:
	README
---

708bc148d1a7d798fc757bb3b917cb8ee058690b
diff --cc README
index 850b393,fbd6606..01533bb
--- a/README
+++ b/README
@@@ -1,3 -1,1 +1,7 @@@
++<<<<<<< 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 now 
++edited now 
++=======
+ This is a test from RS.
++>>>>>>> d4b0a79b9d915d7aa5782b06835a593aa68e0d18