diff options
| author | Jon Reid | 2012-03-06 18:08:11 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-03-06 18:08:11 -0800 |
| commit | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (patch) | |
| tree | f52c7dcc837dd98d28f505696b67b94db15e4c63 /imports/codemirror/mode/gfm | |
| parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
| parent | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (diff) | |
| download | ninja-a12603cfcfe9d82def3b972dcbcc80f1e790ad85.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
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 | |||