Removed merge conflict indicators

9 years ago · abd1c3d55e
parent cc4f831964
commit abd1c3d55e
1 changed files with 1 additions and 5 deletions
--- a/src/apps.json
+++ b/src/apps.json
@ -6436,12 +6436,8 @@
      "cats": [
        19
      ],
-<<<<<<< HEAD
      "env": "^SyntaxHighlighter$",
      "html": "(<script|<link)[^>]*sh(Core|Brush|ThemeDefault)",
-=======
-      "html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
->>>>>>> 266a1e2b853d7e64e40b3ab4e8f6d2d442a6734b
      "website": "github.com/syntaxhighlighter",
      "icon": "SyntaxHighlighter.png"
    },