diff options
| author | Ananya Sen | 2012-07-17 14:25:53 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-17 14:25:53 -0700 |
| commit | 09457e39532e9b35afb9c635266755bfcb9b488a (patch) | |
| tree | 665dcbd41377b98dcab15ff995e9434d9db1a462 /imports/codemirror/mode/rst/rst.js | |
| parent | f2dbca782bbaca3bed96dff808693693ba083ea9 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-09457e39532e9b35afb9c635266755bfcb9b488a.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
Diffstat (limited to 'imports/codemirror/mode/rst/rst.js')
| -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"); |