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/components/ui | |
parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/components/ui')
-rwxr-xr-x | js/components/ui/label-checkbox.reel/label-checkbox.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html index 0efc7ae0..d39fca9b 100755 --- a/js/components/ui/label-checkbox.reel/label-checkbox.html +++ b/js/components/ui/label-checkbox.reel/label-checkbox.html | |||
@@ -20,7 +20,7 @@ | |||
20 | }, | 20 | }, |
21 | 21 | ||
22 | "checkbox": { | 22 | "checkbox": { |
23 | "prototype": "montage/ui/checkbox.reel", | 23 | "prototype": "montage/ui/input-checkbox.reel", |
24 | "properties": { | 24 | "properties": { |
25 | "element": {"#": "checkbox"}, | 25 | "element": {"#": "checkbox"}, |
26 | "checked": false | 26 | "checked": false |