aboutsummaryrefslogtreecommitdiff
path: root/js/components/combobox.reel/combobox.html
diff options
context:
space:
mode:
authorAnanya Sen2012-05-01 13:39:30 -0700
committerAnanya Sen2012-05-01 13:39:30 -0700
commitc360d1a5cfe894591ae65f892ead11d0ca537b18 (patch)
tree13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/combobox.reel/combobox.html
parent3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff)
parente3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff)
downloadninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/combobox.reel/combobox.html')
-rwxr-xr-xjs/components/combobox.reel/combobox.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index d78cc9c1..a68dd37f 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -9,8 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "js/components/combobox.reel", 12 "prototype": "js/components/combobox.reel",
13 "name": "Combobox",
14 "properties": { 13 "properties": {
15 "element": {"#": "cb_comp"} 14 "element": {"#": "cb_comp"}
16 } 15 }