From: rsoulliere Date: Mon, 5 Dec 2011 19:54:33 +0000 (-0500) Subject: Clean up root.xml. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0b762efcff210ddcfbdf88672252942e7d15834e;p=Evergreen-DocBook.git Clean up root.xml. --- diff --git a/root.xml b/root.xml index e1c9a98..aa7fd99 100755 --- a/root.xml +++ b/root.xml @@ -1,128 +1,132 @@ - - - - Evergreen 2.0 Documentation - Draft Version - Documentation Interest Group - - - - - - - - 2011 - Members of the Evergreen Project - - - - - - - - - - - - This document was updated . - - - - - Introduction - - - - - - - - Public Access Catalog - - - - - - Core Staff Tasks - - - - - - - - - - - Administration - - - - - - - - - - - - - - - - - - - - Reports - - - - - - - - - - - - - - - - - Third Party System Integration - - - - - Development - - - - - - - - - - - - - - - Appendices - - - - - - - - - + + + +<<<<<<< rel_2_0 + Evergreen 2.0 Documentation + Draft Version +======= + Evergreen 2.1 Documentation +>>>>>>> local + Documentation Interest Group + + + + + + + + 2011 + Members of the Evergreen Project + + + + + + + + + + + + This document was updated . + + + + + Introduction + + + + + + + + Public Access Catalog + + + + + + Core Staff Tasks + + + + + + + + + + + Administration + + + + + + + + + + + + + + + + + + + + Reports + + + + + + + + + + + + + + + + + Third Party System Integration + + + + + Development + + + + + + + + + + + + + + + Appendices + + + + + + + + +