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/components/popup-manager.reel | |
| 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/components/popup-manager.reel')
| -rwxr-xr-x | js/components/popup-manager.reel/popup-manager.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 1ae93e15..399a2115 100755 --- a/js/components/popup-manager.reel/popup-manager.html +++ b/js/components/popup-manager.reel/popup-manager.html | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | <body> | 27 | <body> |
| 28 | 28 | ||
| 29 | <section id="popupWindows"></section> | 29 | <section data-montage-id="popupWindows"></section> |
| 30 | 30 | ||
| 31 | </body> | 31 | </body> |
| 32 | 32 | ||