From a442e7c8ae78ca335d746025fcb94ccdb718496c Mon Sep 17 00:00:00 2001
From: Brian Wisti <brian.wisti@gmail.com>
Date: Tue, 16 Aug 2011 23:01:08 -0700
Subject: [PATCH] oops. left a merge conflict in

---
 lib/diaspora/markdownify.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/diaspora/markdownify.rb b/lib/diaspora/markdownify.rb
index 19a1067eb..6e38faadd 100644
--- a/lib/diaspora/markdownify.rb
+++ b/lib/diaspora/markdownify.rb
@@ -138,10 +138,6 @@ module Diaspora
           %Q{[#{content}](#{link}#{title_chunk})}
         end
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 6b34a2611da25c7af1c2bcd41c3f8cb326df01a7
         return full_document
       end