diff options
author | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
commit | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch) | |
tree | 657d55ad394de168dd627cf89b875906d10584e2 /js/document/templates | |
parent | d764428023d87446fbbb153d8e04a23b900d71d5 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
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 | ||