diff options
| author | Jon Reid | 2012-06-28 09:51:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-28 09:51:33 -0700 |
| commit | 8780f4be63bac964d23939127298f6334f482cdf (patch) | |
| tree | 197ffef1e31f60f3dc8ddb23a36f263f65c32a9f /node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |
| parent | b50b720e7b34cea86e9aabfb27e843376508b00e (diff) | |
| parent | 7e098b5a710776439ca6ad00604e2f2011dbc4ed (diff) | |
| download | ninja-8780f4be63bac964d23939127298f6334f482cdf.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Used Theirs, doesn't matter, code block is in commented-out section.
Diffstat (limited to 'node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html')
| -rw-r--r-- | node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 332b2932..66471eab 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | } | 45 | } |
| 46 | }, | 46 | }, |
| 47 | "owner": { | 47 | "owner": { |
| 48 | "prototype": "feed-reader/feed-entry.reel", | ||
| 49 | "properties": { | 48 | "properties": { |
| 50 | "element": {"#": "feed-entry"} | 49 | "element": {"#": "feed-entry"} |
| 51 | } | 50 | } |
| @@ -76,6 +75,7 @@ | |||
| 76 | </head> | 75 | </head> |
| 77 | <body> | 76 | <body> |
| 78 | <div class="feed-entry" data-montage-id="feed-entry"> | 77 | <div class="feed-entry" data-montage-id="feed-entry"> |
| 78 | |||
| 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> |
| 80 | <p data-montage-id="entry-description" class="entry-description"></p> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
| 81 | </div> | 81 | </div> |