diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /imports/codemirror/mode/xquery | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'imports/codemirror/mode/xquery')
| -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"/> |