From 805a9eb921a3402032e1300aa5d52a1185fb9b05 Mon Sep 17 00:00:00 2001
From: Brian Wisti <brian.wisti@gmail.com>
Date: Tue, 16 Aug 2011 21:59:13 -0700
Subject: [PATCH] resolve my own merge conflicts.

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

diff --git a/lib/diaspora/markdownify.rb b/lib/diaspora/markdownify.rb
index 49c7665f1..826fa4cb5 100644
--- a/lib/diaspora/markdownify.rb
+++ b/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