diff options
| author | Pushkar Joshi | 2012-03-06 17:04:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-06 17:04:40 -0800 |
| commit | 7a43958033906b2273de88bc2a26cda7a905d202 (patch) | |
| tree | f71817e712c4b07a48257a4f0b206cf9033421df /imports/codemirror/mode/gfm | |
| parent | 264e3d8e6d3624083d2fab9fe2560234553bb2ad (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-7a43958033906b2273de88bc2a26cda7a905d202.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/gfm')
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/gfm/gfm.js | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/gfm/index.html | 0 |
2 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 |
diff --git a/imports/codemirror/mode/gfm/index.html b/imports/codemirror/mode/gfm/index.html index b27d49ab..b27d49ab 100755..100644 --- a/imports/codemirror/mode/gfm/index.html +++ b/imports/codemirror/mode/gfm/index.html | |||