Merge remote-tracking branch 'origin/master' into new-styles

# Conflicts: # src/languages/crmsh.js
highlightjs · Oct 22, 2015 · f56a11d · f56a11d
2 parents b5a91e9 + 4e9dfd7
commit f56a11d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/languages/crmsh.js b/src/languages/crmsh.js
@@ -50,7 +50,7 @@ function(hljs) {
           className: 'title',
           end: '\\s*[\\$\\w_][\\w_-]*',
           starts: {
-            end: '\\s*@?[\\w_][\\w_\\.:-]*',
+            end: '\\s*@?[\\w_][\\w_\\.:-]*'
           }
         }
       },
@@ -59,7 +59,7 @@ function(hljs) {
         keywords: COMMANDS,
         starts: {
           className: 'title',
-          end: '[\\$\\w_][\\w_-]*',
+          end: '[\\$\\w_][\\w_-]*'
         }
       },
       {

diff --git a/src/languages/sqf.js b/src/languages/sqf.js