diff options
| author | Jon Reid | 2012-07-17 16:03:14 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-17 16:03:14 -0700 |
| commit | 42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch) | |
| tree | 67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/mode/markdown | |
| parent | a12cabc16273ffe04af4bce1f7438dc9326efa89 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/markdown')
| -rw-r--r-- | imports/codemirror/mode/markdown/markdown.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/markdown/markdown.js b/imports/codemirror/mode/markdown/markdown.js index af95753e..232ced78 100644 --- a/imports/codemirror/mode/markdown/markdown.js +++ b/imports/codemirror/mode/markdown/markdown.js | |||
| @@ -240,6 +240,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { | |||
| 240 | getType: getType | 240 | getType: getType |
| 241 | }; | 241 | }; |
| 242 | 242 | ||
| 243 | }); | 243 | }, "xml"); |
| 244 | 244 | ||
| 245 | CodeMirror.defineMIME("text/x-markdown", "markdown"); | 245 | CodeMirror.defineMIME("text/x-markdown", "markdown"); |