sync

[web.Reddit] / Reddit / Reddit.Index.bjs

diff --git a/Reddit/Reddit.Index.bjs b/Reddit/Reddit.Index.bjs
index 0547be1..0ddd8b9 100644 (file)
--- a/Reddit/Reddit.Index.bjs
+++ b/Reddit/Reddit.Index.bjs
@@ -2,7 +2,7 @@
     "name" : "Reddit.Index",
     "parent" : "",
     "title" : "",
-    "path" : "/home/alan/gitlive/web.Reddit/Reddit/Reddit.Index.bjs",
+    "path" : "/home/julian/gitlive/web.Reddit/Reddit/Reddit.Index.bjs",
     "permname" : "",
     "modOrder" : "001",
     "items" : [
@@ -142,7 +142,11 @@
                                                     "String tag" : "p",
                                                     "xtype" : "Element",
                                                     "$ xns" : "Roo.bootstrap",
+<<<<<<< HEAD
+                                                    "String html" : "\n<!-- {feed:r} -->\n<style>\n.feed-body-html a { display:none }\n</style>\n\n<div flexy:foreach=\"feed,f\">\n\n<!-- <h3>10am</h3> -->\n<hr />\n\n<div class=\"feed-body-html\"> {f.body_html:h} </div>\n<div flexy:foreach=\"f.embeds_ar,e\">\n<iframe style=\"{e.frame_style}\" src=\"Embed/{e.id}\" height=\"{e.frame_height}\" width=\"{e.frame_width}\"></iframe>\n</div>\n<p> the image associated with it goes here </p>\n<p><a href=\"#\">{e.original url}</a> </p>\n\n\n<p> <small><B>{f.created_local_dt}</B></small> | <a href=\"#\">/reddit/{f.author}</a> |  <a href=\"#\">Download as PDF</a> </p>\n</div>"
+=======
                                                     "String html" : "\n<!-- {feed:r} -->\n<style>\n.feed-body-html a { display:none }\n</style>\n\n\n\n<div flexy:foreach=\"feed,f\">\n\n    <!-- <h3>10am</h3> -->\n    <hr />\n\n\n\n    <div class=\"feed-body-html\"> {f.body_html:h} </div>\n\n    <div flexy:foreach=\"f.embeds,e\">\n\n    </div>\n    <p> the image associated with it goes here </p>\n    <p><a href=\"#\">{e.original url}</a> </p>\n\n\n   <p> <small><B>{f.created_local_dt}</B></small> | <a href=\"#\">/reddit/{f.author}</a> |  <a href=\"#\">Download as PDF</a> </p>\n</div>"
+>>>>>>> 52d78a4d053c6c15471b2dcfe1d14cca9551951b
                                                 }
                                             ]
                                         }