diff options
author | Jon Reid | 2012-06-20 15:05:26 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /js/panels/components-panel.reel/components-panel.js | |
parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.js')
-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 | } |