diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/properties.reel/sections/custom.reel/custom.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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> |