extended Dan Scott's work on semantic markup

diff --cc 1.6/admin/requirements-configuration.xml
index 965d815,dd56bb4..f069b80
--- 1/1.6/admin/requirements-configuration.xml
--- 2/1.6/admin/requirements-configuration.xml
+++ b/1.6/admin/requirements-configuration.xml
@@@ -26,7 -26,8 +26,12 @@@
                        <info>\r
                                <title>Server Hardware Configurations and Clustering</title>\r
                        </info>\r
++<<<<<<< HEAD
 +                      <para>The hardware requirements for running a functional Evergreen server are minimal. It is also possible to scale up your evergreen configuration to be spread your Evergreen resources and services over several or even many servers in a clustered approach for the purpose \r
++=======
+                       <para>The hardware requirements for running a functional Evergreen server are minimal. It is also possible\r
+                       to scale up your evergreen configuration to be spread your Evergreen resources and services over several or even many servers in a clustered approach for the purpose \r
++>>>>>>> d7545acfb3e35c75cd8d52bf8ca16ca95df72832
                        of system redundancy, load balancing and downtime reduction. This allows very large \r
                        consortia to share one Evergreen system with hundreds of libraries with millions of records and millions of users, making the scalability of Evergreen almost infinite.</para>\r
                        <para>Here are some example scenarios for networked server configurations:</para>\r