diff options
author | Eric Guzman | 2012-06-11 13:28:42 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-11 13:28:42 -0700 |
commit | 3a4727ffc350216a434a7c6977b6a23653b77780 (patch) | |
tree | c5dff306f8803c36a16163ba5df1e7f492e762b5 /node_modules/components-data/feed-reader.json | |
parent | d6b46ba496c9c8974ae39bb476aea35bcd1ddaf1 (diff) | |
parent | 337efc667372326ae2f9984d89a47bb151016774 (diff) | |
download | ninja-3a4727ffc350216a434a7c6977b6a23653b77780.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'node_modules/components-data/feed-reader.json')
-rw-r--r-- | node_modules/components-data/feed-reader.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 5e8ca527..0676cac1 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
@@ -18,6 +18,7 @@ | |||
18 | "possibleValues": ["animation", "timer"] | 18 | "possibleValues": ["animation", "timer"] |
19 | } | 19 | } |
20 | ], | 20 | ], |
21 | |||
21 | "defaultStyles": { | 22 | "defaultStyles": { |
22 | "width":"380px", | 23 | "width":"380px", |
23 | "height":"120px" | 24 | "height":"120px" |