aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/components-panel.reel
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/components-panel.reel')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html3
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