aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xmlpure
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /imports/codemirror/mode/xmlpure
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'imports/codemirror/mode/xmlpure')
-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>