diff options
| author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
| commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /imports/codemirror | |
| parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
| parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
| download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'imports/codemirror')
| -rw-r--r-- | imports/codemirror/mode/xquery/test/index.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/imports/codemirror/mode/xquery/test/index.html b/imports/codemirror/mode/xquery/test/index.html index ba82e54f..09238a19 100644 --- a/imports/codemirror/mode/xquery/test/index.html +++ b/imports/codemirror/mode/xquery/test/index.html | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" | 1 | <!doctype html> |
| 2 | "http://www.w3.org/TR/html4/loose.dtd"> | ||
| 3 | <html> | 2 | <html> |
| 4 | <head> | 3 | <head> |
| 5 | <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-git.css" type="text/css"/> | 4 | <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-git.css" type="text/css"/> |