diff options
author | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
commit | ab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch) | |
tree | b1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/document/templates | |
parent | fb8aacbadba8dffb9619eb16e4626c197dc9264d (diff) | |
parent | da60be29baab67440535b6b2b71fe7de989dfed0 (diff) | |
download | ninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz |
Merge branch 'refs/heads/integration-candidate' into Timeline
Diffstat (limited to 'js/document/templates')
-rwxr-xr-x | js/document/templates/montage-html/index.html | 1 | ||||
-rwxr-xr-x | js/document/templates/montage-html/styles.css | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html index 8b3d73bb..edfab2b0 100755 --- a/js/document/templates/montage-html/index.html +++ b/js/document/templates/montage-html/index.html | |||
@@ -12,7 +12,6 @@ | |||
12 | <title>Ninja Prototype</title> | 12 | <title>Ninja Prototype</title> |
13 | 13 | ||
14 | <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | 14 | <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/> |
15 | <link href="styles.css" id="nj-default-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | ||
16 | 15 | ||
17 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> | 16 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> |
18 | 17 | ||
diff --git a/js/document/templates/montage-html/styles.css b/js/document/templates/montage-html/styles.css deleted file mode 100755 index 0441c1cf..00000000 --- a/js/document/templates/montage-html/styles.css +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ \ No newline at end of file | ||