diff options
| author | Valerio Virgillito | 2012-06-06 00:27:59 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-06 00:27:59 -0700 |
| commit | 91123fef348ec54d89005adbc151e816856a6a18 (patch) | |
| tree | ac20e473f2ef52ef1f7deb18eab4d38d6a35ec4b /node_modules/montage-google/feed-reader/feed-entry.reel | |
| parent | 0e1a276f19ea70009c5a649e9667861d7c346a7e (diff) | |
| parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
| download | ninja-91123fef348ec54d89005adbc151e816856a6a18.tar.gz | |
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts:
js/components/tools-properties/fill-properties.reel/fill-properties.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage-google/feed-reader/feed-entry.reel')
| -rw-r--r-- | node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | 3 |
1 files changed, 1 insertions, 2 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 8e9b3371..b8b9f39a 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 | |||
| @@ -76,8 +76,7 @@ | |||
| 76 | </head> | 76 | </head> |
| 77 | <body> | 77 | <body> |
| 78 | <div class="feed-entry" data-montage-id="feed-entry"> | 78 | <div class="feed-entry" data-montage-id="feed-entry"> |
| 79 | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | |
| 80 | <a target="_blank" id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | ||
| 81 | <p data-montage-id="entry-description" class="entry-description"></p> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
| 82 | </div> | 81 | </div> |
| 83 | 82 | ||