aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-23 13:23:12 -0700
committerJose Antonio Marquez2012-03-23 13:23:12 -0700
commit67aaba2e752ea1964356f487269cafc686abb9a7 (patch)
treec3794257facf5992aff796b1ef11ae661b2aa3cb /node_modules
parent7e61ce5aba0c8465595804da21e365baf4d8c15d (diff)
parent3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859 (diff)
downloadninja-67aaba2e752ea1964356f487269cafc686abb9a7.tar.gz
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
Diffstat (limited to 'node_modules')
-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 ],