Added Back to School preset search category

Conflicts:
	Open-ILS/examples/kpac.xml

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 357ab57..62c0e37 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -34,9 +34,14 @@
             -->
            
             <cell name="4th of July" img="cat-independence.png" type="maintopic">(keyword:independence day || keyword:fourth of july)</cell>
+<<<<<<< HEAD
             
             <!--
+=======
+            -->
+>>>>>>> 7c5c23d... Added Back to School preset search category
             <cell name="Back to School" img="cat-school.png" type="maintopic">(keyword:back to school || keyword:goes to school)</cell>
+            <!--
             <cell name="Halloween" img="cat-halloween.png" type="maintopic">keyword:halloween</cell> 
             <cell name="Thanksgiving" img="cat-thanksgiving.png" type="maintopic">keyword:thanksgiving</cell>