diff options
author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/panels/components-panel.reel | |
parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/components-panel.reel')
-rwxr-xr-x | js/panels/components-panel.reel/components-panel.js | 5 |
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 | } |