Removing 4th of July KPAC link

Conflicts:
	Open-ILS/examples/kpac.xml

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 1df84aa..6ab97b7 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -31,15 +31,8 @@
             <cell name="Valentine's Day" img="cat-valentines.png" type="maintopic">keyword:valentine's day</cell> 
             <cell name="St. Patrick's Day" img="cat-stpatricks.png" type="maintopic">keyword:st. patrick's day</cell> 
             <cell name="Easter" img="cat-easter.png" type="maintopic">keyword:easter</cell>
-            -->
-           
             <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>