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/PanelContainer.reel/PanelContainer.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/PanelContainer.reel/PanelContainer.html')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index 900930d9..2f8ea83f 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | "properties": { | 74 | "properties": { |
| 75 | "element": {"#": "panelContainer"}, | 75 | "element": {"#": "panelContainer"}, |
| 76 | "panelData": {"@": "panelData" }, | 76 | "panelData": {"@": "panelData" }, |
| 77 | "panelController" : {"@": "PanelController"}, | ||
| 78 | "panel_0": {"@": "panel_0"}, | 77 | "panel_0": {"@": "panel_0"}, |
| 79 | "panel_1": {"@": "panel_1"}, | 78 | "panel_1": {"@": "panel_1"}, |
| 80 | "panel_2": {"@": "panel_2"}, | 79 | "panel_2": {"@": "panel_2"}, |
| @@ -104,7 +103,7 @@ | |||
| 104 | 103 | ||
| 105 | </head> | 104 | </head> |
| 106 | <body> | 105 | <body> |
| 107 | <section id="panelContainer"> | 106 | <section data-montage-id="panelContainer"> |
| 108 | <article id="panels" class="panels"> | 107 | <article id="panels" class="panels"> |
| 109 | <article data-montage-id="panel_0"></article> | 108 | <article data-montage-id="panel_0"></article> |
| 110 | <article data-montage-id="panel_1"></article> | 109 | <article data-montage-id="panel_1"></article> |