diff options
| author | John Mayhew | 2012-07-09 17:28:24 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
| commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /imports/codemirror | |
| parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
| parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
| download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
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"/> |