diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/panels/components-panel.reel | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
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 | } |