aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/markdown
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 11:42:09 -0700
committerJonathan Duran2012-07-17 11:42:09 -0700
commitb4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/mode/markdown
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/markdown')
-rw-r--r--imports/codemirror/mode/markdown/markdown.js2
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
245CodeMirror.defineMIME("text/x-markdown", "markdown"); 245CodeMirror.defineMIME("text/x-markdown", "markdown");