aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/rst
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-17 14:01:12 -0700
committerJose Antonio Marquez2012-07-17 14:01:12 -0700
commitf40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd (patch)
treecb1ff6a31b144fe4f584f778d5691f06362b227e /imports/codemirror/mode/rst
parent17d464e5bd224cdd8940855409359b411325f1df (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-f40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'imports/codemirror/mode/rst')
-rw-r--r--imports/codemirror/mode/rst/rst.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/rst/rst.js b/imports/codemirror/mode/rst/rst.js
index 411bac56..c4ecdf4c 100644
--- a/imports/codemirror/mode/rst/rst.js
+++ b/imports/codemirror/mode/rst/rst.js
@@ -321,6 +321,6 @@ CodeMirror.defineMode('rst', function(config, options) {
321 return token; 321 return token;
322 } 322 }
323 }; 323 };
324}); 324}, "python");
325 325
326CodeMirror.defineMIME("text/x-rst", "rst"); 326CodeMirror.defineMIME("text/x-rst", "rst");