aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel/components-panel.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:47:25 -0700
committerJose Antonio Marquez2012-06-20 16:47:25 -0700
commit54b15b3c39835ea999d9ddd8038a5531630e266d (patch)
treec207d1290be0e894a57b03098bbb7bbe5f2aee86 /js/panels/components-panel.reel/components-panel.js
parentba125a7213cc257d648b22afb14f76d43f60d00d (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-54b15b3c39835ea999d9ddd8038a5531630e266d.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.js')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js5
1 files changed, 0 insertions, 5 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index e6b7a6e3..46f91410 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -98,11 +98,6 @@ exports.ComponentsPanel = Montage.create(Component, {
98 "text": "Textfield", 98 "text": "Textfield",
99 "dataFile" : "node_modules/components-data/textfield.json", 99 "dataFile" : "node_modules/components-data/textfield.json",
100 "component": "textfield" 100 "component": "textfield"
101 },
102 {
103 "text": "Toggle Button",
104 "dataFile" : "node_modules/components-data/toggle-button.json",
105 "component": "toggleButton"
106 } 101 }
107 ] 102 ]
108 } 103 }