diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/properties.reel/sections/custom.reel/custom.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel/custom.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html index cc48d2e7..cfc5208c 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.html +++ b/js/panels/properties.reel/sections/custom.reel/custom.html | |||
| @@ -49,9 +49,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 49 | </script> | 49 | </script> |
| 50 | </head> | 50 | </head> |
| 51 | <body> | 51 | <body> |
| 52 | <div id="section" class="sectional"> | 52 | <div data-montage-id="section" class="sectional"> |
| 53 | <div id="repetitionContainer"> | 53 | <div data-montage-id="repetitionContainer"> |
| 54 | <div id="repeitionContent"></div> | 54 | <div data-montage-id="repeitionContent"></div> |
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | </body> | 57 | </body> |