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/components-panel.reel/components-panel.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/components-panel.reel/components-panel.html')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html index c78988e0..1a257957 100755 --- a/js/panels/components-panel.reel/components-panel.html +++ b/js/panels/components-panel.reel/components-panel.html | |||
| @@ -53,8 +53,8 @@ | |||
| 53 | </head> | 53 | </head> |
| 54 | <body> | 54 | <body> |
| 55 | 55 | ||
| 56 | <div id="components_panel" class="components_panel"> | 56 | <div data-montage-id="components_panel" class="components_panel"> |
| 57 | <div id="componentsContainer"></div> | 57 | <div data-montage-id="componentsContainer"></div> |
| 58 | </div> | 58 | </div> |
| 59 | 59 | ||
| 60 | </body> | 60 | </body> |