aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xmlpure/index.html
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/mode/xmlpure/index.html
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'imports/codemirror/mode/xmlpure/index.html')
-rw-r--r--imports/codemirror/mode/xmlpure/index.html1
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>