tips: Fixup small merge conflict

scp/kb.php

@@ -25,7 +25,7 @@ if($category && $_REQUEST['a']!='search') {
 }
 $nav->setTabActive('kbase');
 $ost->addExtraHeader('<meta name="tip-namespace" content="knowledgebase.faqs" />',
-    "$('#content').data('tipNamespace', '".$tip_namespace."');");
+    "$('#content').data('tipNamespace', 'knowledgebase.faqs');");
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');

scp/tickets.php

@@ -623,7 +623,7 @@ if($ticket) {
 
 $ost->addExtraHeader('<script type="text/javascript" src="js/ticket.js"></script>');
 $ost->addExtraHeader('<meta name="tip-namespace" content="tickets.open" />',
-    "$('#content').data('tipNamespace', 'tickets.open');");
+    "$('#content').data('tipNamespace', 'tickets.queue');");
 
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);