Fixed merge conflict

main
Elbert Alias 10 years ago
commit fce0e221db

@ -6437,7 +6437,7 @@
19 19
], ],
"env": "^SyntaxHighlighter$", "env": "^SyntaxHighlighter$",
"html": "(<script|<link)[^>]*sh(Core|Brush|ThemeDefault)", "html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
"website": "github.com/syntaxhighlighter", "website": "github.com/syntaxhighlighter",
"icon": "SyntaxHighlighter.png" "icon": "SyntaxHighlighter.png"
}, },