diff options
| author | Jonathan Duran | 2012-07-17 11:42:09 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-17 11:42:09 -0700 |
| commit | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch) | |
| tree | 2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/mode/rst | |
| parent | 4a87ff575693509ac578d46af26fa137c0dc3f58 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/rst')
| -rw-r--r-- | imports/codemirror/mode/rst/rst.js | 2 |
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 | ||
| 326 | CodeMirror.defineMIME("text/x-rst", "rst"); | 326 | CodeMirror.defineMIME("text/x-rst", "rst"); |