language and config

LMS235 · Sep 9, 2014 · 7b9748c · 7b9748c
1 parent 46b00d8
commit 7b9748c
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/syntax.php b/syntax.php
@@ -9,13 +9,6 @@
 // must be run within Dokuwiki
 if (!defined('DOKU_INC')) die();
 
-<<<<<<< HEAD
-=======
-# SAP Hinweis URL
-global $sapnote_url;
-$sapnote_url = "https://service.sap.com/sap/support/notes";
-
->>>>>>> origin/master
 class syntax_plugin_sapnotelink extends DokuWiki_Syntax_Plugin {