diff options
| author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
| commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
| tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels/components-panel.reel/components-panel.html | |
| parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.html')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html index 1a257957..a8d71d50 100755 --- a/js/panels/components-panel.reel/components-panel.html +++ b/js/panels/components-panel.reel/components-panel.html | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | "owner": { | 14 | "owner": { |
| 15 | "prototype": "js/panels/components-panel.reel", | 15 | "prototype": "js/panels/components-panel.reel", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "components_panel"}, | 17 | "element": {"#": "components_panel"} |
| 18 | "controller": {"@": "componentsTree"} | ||
| 19 | } | 18 | } |
| 20 | }, | 19 | }, |
| 21 | 20 | ||