\r
<section xml:id="new-features-1">\r
<title>Support PO activation without requiring items</title>\r
++<<<<<<< HEAD
+<para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the PO allows staff to activate the PO without loading copies into the catalogue.</para>\r
++=======
+ <para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the PO allows staff to activate the PO without loading copies into the catalog.</para>\r
++>>>>>>> sitka_2_6
</section>\r
\r
<section xml:id="new-features-2">\r
\r
<section xml:id="new-features-4">\r
<title>Printing PO Names on Purchase Orders</title>\r
++<<<<<<< HEAD
+<para>The <guilabel>Print Purchase Order</guilabel> option now prints the PO Name in addition to the PO ID.</para>\r
++=======
+ <para>The <guilabel>Print Purchase Order</guilabel> option now prints the PO Name in\r
+ addition to the PO ID.</para>\r
++>>>>>>> sitka_2_6
</section>\r
\r
</chapter>\r