diff options
author | Valerio Virgillito | 2012-03-23 12:21:30 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-23 12:21:30 -0700 |
commit | 3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859 (patch) | |
tree | 08255c0c5f069584ab06ff6883f139e2da699d77 /node_modules | |
parent | 80aa8696aca8df6081e4e5d23bf35ed6e3155a7a (diff) | |
parent | b0009433f98e7c9f777c7a7b91640fea8049a6f0 (diff) | |
download | ninja-3ac73ef7f5de7fb3869c4b84537a6dc6ef86b859.tar.gz |
Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal into montage-integration
Diffstat (limited to 'node_modules')
-rw-r--r-- | node_modules/components-data/feed-reader.json | 2 |
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 | ], |