Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
[working/Evergreen.git] / README
1 <<<<<<< HEAD
2 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
3
4 <<<<<<< HEAD
5 edited from github #2 .
6 =======
7 <<<<<<< HEAD
8 test edit.
9 edited from clone of official.
10 =======
11 edited from github.
12 >>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af
13 >>>>>>> 01f1cae45e26b13819546131fd5a57181e656bbb