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 /js/panels/PanelContainer.reel/PanelContainer.html | |
| 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 'js/panels/PanelContainer.reel/PanelContainer.html')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index c84315d3..77bb23db 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -149,10 +149,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 149 | } | 149 | } |
| 150 | </script> | 150 | </script> |
| 151 | 151 | ||
| 152 | </head> | 152 | </head> |
| 153 | <body> | 153 | <body> |
| 154 | <section data-montage-id="panelContainer"> | 154 | <section data-montage-id="panelContainer"> |
| 155 | <article id="panels" class="panels"> | 155 | <article id="panels" class="panels"> |
| 156 | <article data-montage-id="panel_0"></article> | 156 | <article data-montage-id="panel_0"></article> |
| 157 | <article data-montage-id="panel_1"></article> | 157 | <article data-montage-id="panel_1"></article> |
| 158 | <article data-montage-id="panel_2"></article> | 158 | <article data-montage-id="panel_2"></article> |
| @@ -161,7 +161,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 161 | <article data-montage-id="panel_5"></article> | 161 | <article data-montage-id="panel_5"></article> |
| 162 | <article data-montage-id="panel_6"></article> | 162 | <article data-montage-id="panel_6"></article> |
| 163 | <article data-montage-id="panel_7"></article> | 163 | <article data-montage-id="panel_7"></article> |
| 164 | </article> | 164 | </article> |
| 165 | </section> | 165 | </section> |
| 166 | </body> | 166 | </body> |
| 167 | </html> | 167 | </html> |