bad merge in receive

2010-10-28 09:43:44 -07:00 · 2010-10-28 09:43:44 -07:00 · b8a9025616
commit b8a9025616
parent a5ba14f89c
1 changed files with 0 additions and 1 deletions
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@ -17,7 +17,6 @@ module Diaspora
            puts e.inspect
            Rails.logger e.inspect
          end
-        end
        }
      end