projects
/
Evergreen-DocBook.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
[Evergreen-DocBook.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
edited now
5
=======
6
This is a test from RS.
7
>>>>>>> d4b0a79b9d915d7aa5782b06835a593aa68e0d18