diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/markdown/index.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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> |