fixing conflicts

This commit is contained in:
Sacha Greif 2012-10-01 14:18:41 +09:00
parent 8e473432be
commit b8afef41dd

View file

@ -9,4 +9,4 @@ Template.post_page.body_formatted = function(){
return html_body.autoLink(); return html_body.autoLink();
} }
window.newCommentTimestamp=new Date(); window.newCommentTimestamp=new Date();