Fixed merge conflict

main
Elbert Alias 9 years ago
commit fce0e221db

@ -6437,7 +6437,7 @@
19
],
"env": "^SyntaxHighlighter$",
"html": "(<script|<link)[^>]*sh(Core|Brush|ThemeDefault)",
"html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
"website": "github.com/syntaxhighlighter",
"icon": "SyntaxHighlighter.png"
},
@ -8708,4 +8708,4 @@
"50": "document-management-systems",
"51": "landing-page-builders"
}
}
}
Loading…
Cancel
Save