aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-24 13:53:34 -0700
committerNivesh Rajbhandari2012-03-24 13:53:34 -0700
commit5e8faa47e1b2507a09d04fea4325006e5eab2f25 (patch)
tree56683c1be0485f560ff49e8125f0b19dd42199f3 /node_modules/components-data
parent2946d01666ff81f913bd06d1ac1381ed42b4a010 (diff)
parent7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff)
downloadninja-5e8faa47e1b2507a09d04fea4325006e5eab2f25.tar.gz
Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/feed-reader.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 7a5bd276..39da73f3 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -14,7 +14,7 @@
14 { 14 {
15 "name": "feedDisplayMode", 15 "name": "feedDisplayMode",
16 "type": "select", 16 "type": "select",
17 "default": "animation", 17 "default": "timer",
18 "possibleValues": ["animation", "timer"] 18 "possibleValues": ["animation", "timer"]
19 } 19 }
20 ], 20 ],