aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/gfm/gfm.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-06 17:04:40 -0800
committerPushkar Joshi2012-03-06 17:04:40 -0800
commit7a43958033906b2273de88bc2a26cda7a905d202 (patch)
treef71817e712c4b07a48257a4f0b206cf9033421df /imports/codemirror/mode/gfm/gfm.js
parent264e3d8e6d3624083d2fab9fe2560234553bb2ad (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-7a43958033906b2273de88bc2a26cda7a905d202.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/gfm/gfm.js')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/gfm/gfm.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/gfm/gfm.js b/imports/codemirror/mode/gfm/gfm.js
index 1e9d7d87..01afed7b 100755..100644
--- a/imports/codemirror/mode/gfm/gfm.js
+++ b/imports/codemirror/mode/gfm/gfm.js
@@ -8,7 +8,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
8 "c++": "text/x-c++src", 8 "c++": "text/x-c++src",
9 java: "text/x-java", 9 java: "text/x-java",
10 csharp: "text/x-csharp", 10 csharp: "text/x-csharp",
11 "c#": "text/x-csharp", 11 "c#": "text/x-csharp"
12 }; 12 };
13 13
14 // make this lazy so that we don't need to load GFM last 14 // make this lazy so that we don't need to load GFM last