resolve my own merge conflicts.

lib/diaspora/markdownify.rb

@@ -1,5 +1,4 @@
 require 'erb'
-require 'uri'
 
 module Diaspora
   module Markdownify
@@ -139,11 +138,9 @@ module Diaspora
           %Q{[#{content}](#{link}#{title_chunk})}
         end
 
-
         return full_document
       end
 
-
       def single_emphasis(text)
         "<em>#{text}</em>"
       end