diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/lib/util/formatting.js | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
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 | ||