aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/rst/rst.js
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/rst/rst.js
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/rst/rst.js')
-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");