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/clojure | |
| 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/clojure')
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/clojure/clojure.js | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/clojure/index.html | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/clojure/clojure.js b/imports/codemirror/mode/clojure/clojure.js index a951589e..cce7ce37 100755..100644 --- a/imports/codemirror/mode/clojure/clojure.js +++ b/imports/codemirror/mode/clojure/clojure.js | |||
| @@ -103,7 +103,7 @@ CodeMirror.defineMode("clojure", function (config, mode) { | |||
| 103 | return { | 103 | return { |
| 104 | indentStack: null, | 104 | indentStack: null, |
| 105 | indentation: 0, | 105 | indentation: 0, |
| 106 | mode: false, | 106 | mode: false |
| 107 | }; | 107 | }; |
| 108 | }, | 108 | }, |
| 109 | 109 | ||
diff --git a/imports/codemirror/mode/clojure/index.html b/imports/codemirror/mode/clojure/index.html index 9762d589..9762d589 100755..100644 --- a/imports/codemirror/mode/clojure/index.html +++ b/imports/codemirror/mode/clojure/index.html | |||