From d2d60c76e1d33bb2d9edf6979f455bb92335c9be Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 29 Jul 2014 15:58:40 -0400
Subject: [PATCH] Added Back to School preset search category

Conflicts:
	Open-ILS/examples/kpac.xml
---
 Open-ILS/examples/kpac.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 357ab57678..62c0e376cb 100644
--- 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>
                        
-- 
2.11.0