From 8a95bef8df6c6c53fc081ea977d13a1343d15a4b Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Mon, 24 Feb 2014 16:41:18 +0530 Subject: [PATCH] [IMP]resolve conflict bzr revid: mba@tinyerp.com-20140224111118-ckxktrew1da6qh9n --- addons/website_blog/static/src/js/website_blog.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js index 04a84850c0e..b35e7d945bc 100644 --- a/addons/website_blog/static/src/js/website_blog.js +++ b/addons/website_blog/static/src/js/website_blog.js @@ -1,5 +1,4 @@ $(document).ready(function() { -<<<<<<< TREE var discussion = false; var share = false; @@ -13,14 +12,9 @@ $(document).ready(function() { def.done( function(){ var content = $("#blog_content p"); if(content.length && discussion) - new openerp.website.blog_discussion({'document_user': $('#is_document_user').length, 'content' : content}); + new openerp.website.blog_discussion({'content' : content}); if (share) $("p").share(); }) -======= - var content = $("#blog_content p"); - if(content.length) - new openerp.website.blog_discussion({'content' : content}); ->>>>>>> MERGE-SOURCE $('.cover_footer').on('click',page_transist); $('a[href^="#blog_content"]').on('click', animate);