aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
diff options
context:
space:
mode:
authorKruti Shah2012-06-28 09:24:03 -0700
committerKruti Shah2012-06-28 09:24:03 -0700
commit8aef94d26e172785463161899dfcc877b4233bdb (patch)
treea9d5ff91681aa06bf26cb62994461a58d3f80005 /node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
parentdeefd070e5e6e793eef2c3d937e7b1a97b0f6830 (diff)
parent299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
downloadninja-8aef94d26e172785463161899dfcc877b4233bdb.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
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.html1
1 files changed, 0 insertions, 1 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 4d6792a1..a5c1346f 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
@@ -38,7 +38,6 @@
38 }, 38 },
39 39
40 "owner": { 40 "owner": {
41 "prototype": "feed-reader/feed-reader.reel",
42 "properties": { 41 "properties": {
43 "element": {"#": "feed-reader"} 42 "element": {"#": "feed-reader"}
44 } 43 }