diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/lib/util/formatting.js | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'imports/codemirror/lib/util/formatting.js')
| -rw-r--r-- | imports/codemirror/lib/util/formatting.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/lib/util/formatting.js b/imports/codemirror/lib/util/formatting.js index 15de0355..e1891191 100644 --- a/imports/codemirror/lib/util/formatting.js +++ b/imports/codemirror/lib/util/formatting.js | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // ============== Formatting extensions ============================ | 1 | // ============== Formatting extensions ============================ |
| 2 | // A common storage for all mode-specific formatting features | 2 | // A common storage for all mode-specific formatting features |
| 3 | if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {}; | 3 | if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {}; |
| 4 | 4 | ||