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/markdown/index.html | |
| 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/markdown/index.html')
| -rw-r--r-- | imports/codemirror/mode/markdown/index.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/imports/codemirror/mode/markdown/index.html b/imports/codemirror/mode/markdown/index.html index 3a60c03f..cae8df44 100644 --- a/imports/codemirror/mode/markdown/index.html +++ b/imports/codemirror/mode/markdown/index.html | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | <script src="../../lib/codemirror.js"></script> | 6 | <script src="../../lib/codemirror.js"></script> |
| 7 | <script src="../xml/xml.js"></script> | 7 | <script src="../xml/xml.js"></script> |
| 8 | <script src="markdown.js"></script> | 8 | <script src="markdown.js"></script> |
| 9 | <link rel="stylesheet" href="markdown.css"> | ||
| 10 | <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> | 9 | <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> |
| 11 | <link rel="stylesheet" href="../../doc/docs.css"> | 10 | <link rel="stylesheet" href="../../doc/docs.css"> |
| 12 | </head> | 11 | </head> |