diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html')
-rw-r--r-- | node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html index 99a353b9..4d6792a1 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |||
@@ -24,7 +24,7 @@ | |||
24 | }, | 24 | }, |
25 | 25 | ||
26 | "feedEntry": { | 26 | "feedEntry": { |
27 | "prototype": "montage-google/feed-reader/feed-entry.reel", | 27 | "prototype": "feed-reader/feed-entry.reel", |
28 | "properties": { | 28 | "properties": { |
29 | "element": {"#": "feed-entry"} | 29 | "element": {"#": "feed-entry"} |
30 | }, | 30 | }, |
@@ -38,7 +38,7 @@ | |||
38 | }, | 38 | }, |
39 | 39 | ||
40 | "owner": { | 40 | "owner": { |
41 | "prototype": "montage-google/feed-reader/feed-reader.reel", | 41 | "prototype": "feed-reader/feed-reader.reel", |
42 | "properties": { | 42 | "properties": { |
43 | "element": {"#": "feed-reader"} | 43 | "element": {"#": "feed-reader"} |
44 | } | 44 | } |