diff options
| author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
| commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
| tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /imports/codemirror/mode/rpm/spec/spec.js | |
| parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'imports/codemirror/mode/rpm/spec/spec.js')
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rpm/spec/spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/rpm/spec/spec.js b/imports/codemirror/mode/rpm/spec/spec.js index 3b5c08c9..902db6ae 100755..100644 --- a/imports/codemirror/mode/rpm/spec/spec.js +++ b/imports/codemirror/mode/rpm/spec/spec.js | |||
| @@ -14,7 +14,7 @@ CodeMirror.defineMode("spec", function(config, modeConfig) { | |||
| 14 | return { | 14 | return { |
| 15 | controlFlow: false, | 15 | controlFlow: false, |
| 16 | macroParameters: false, | 16 | macroParameters: false, |
| 17 | section: false, | 17 | section: false |
| 18 | }; | 18 | }; |
| 19 | }, | 19 | }, |
| 20 | token: function (stream, state) { | 20 | token: function (stream, state) { |