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/mode/xmlpure | |
| 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/mode/xmlpure')
| -rw-r--r-- | imports/codemirror/mode/xmlpure/index.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html index 721834ac..0fdac7e5 100644 --- a/imports/codemirror/mode/xmlpure/index.html +++ b/imports/codemirror/mode/xmlpure/index.html | |||
| @@ -54,6 +54,5 @@ and we're inside a comment! --> | |||
| 54 | <p><b>@date</b>: August, 2011<br/> | 54 | <p><b>@date</b>: August, 2011<br/> |
| 55 | <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p> | 55 | <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p> |
| 56 | 56 | ||
| 57 | <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/xml</code>.</p> | ||
| 58 | </body> | 57 | </body> |
| 59 | </html> | 58 | </html> |