diff options
author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/document/templates/montage-web/index.html | |
parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/document/templates/montage-web/index.html')
-rwxr-xr-x | js/document/templates/montage-web/index.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 90b0f7fd..630794a4 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html | |||
@@ -24,8 +24,7 @@ | |||
24 | <script type="text/montage-serialization"> | 24 | <script type="text/montage-serialization"> |
25 | { | 25 | { |
26 | "owner": { | 26 | "owner": { |
27 | "module": "main.reel", | 27 | "prototype": "main.reel" |
28 | "name": "Main" | ||
29 | } | 28 | } |
30 | } | 29 | } |
31 | </script> | 30 | </script> |
@@ -42,7 +41,7 @@ | |||
42 | 41 | ||
43 | <body> | 42 | <body> |
44 | 43 | ||
45 | <div>IPSUM</div> | 44 | <!--<div>IPSUM</div>--> |
46 | 45 | ||
47 | </body> | 46 | </body> |
48 | 47 | ||