diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/document/templates/montage-web/index.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/document/templates/montage-web/index.html')
| -rwxr-xr-x | js/document/templates/montage-web/index.html | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 90b0f7fd..caebc8d0 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html | |||
| @@ -24,26 +24,15 @@ | |||
| 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> |
| 32 | 31 | ||
| 33 | <style> | ||
| 34 | div { | ||
| 35 | width: 4000px; | ||
| 36 | height: 300px; | ||
| 37 | background: red; | ||
| 38 | } | ||
| 39 | </style> | ||
| 40 | |||
| 41 | </head> | 32 | </head> |
| 42 | 33 | ||
| 43 | <body> | 34 | <body> |
| 44 | 35 | <style></style> | |
| 45 | <div>IPSUM</div> | ||
| 46 | |||
| 47 | </body> | 36 | </body> |
| 48 | 37 | ||
| 49 | </html> \ No newline at end of file | 38 | </html> \ No newline at end of file |