aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/markdown
diff options
context:
space:
mode:
authorAnanya Sen2012-07-17 14:25:53 -0700
committerAnanya Sen2012-07-17 14:25:53 -0700
commit09457e39532e9b35afb9c635266755bfcb9b488a (patch)
tree665dcbd41377b98dcab15ff995e9434d9db1a462 /imports/codemirror/mode/markdown
parentf2dbca782bbaca3bed96dff808693693ba083ea9 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-09457e39532e9b35afb9c635266755bfcb9b488a.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
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");