From 21f64683b036004986b94309c99467e21214eb33 Mon Sep 17 00:00:00 2001
From: Mike Barnes <mike@bremensaki.com>
Date: Sat, 6 Mar 2021 20:17:51 +1100
Subject: [PATCH] Extra line in one file somehow?

---
 app/lib/webfinger.rb                    | 3 ---
 app/services/resolve_account_service.rb | 1 -
 2 files changed, 4 deletions(-)

diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
index 8738952cb..c7aa43bb3 100644
--- a/app/lib/webfinger.rb
+++ b/app/lib/webfinger.rb
@@ -49,11 +49,8 @@ class Webfinger
         res.body_with_limit
       elsif res.code == 404 && use_fallback
         body_from_host_meta
-<<<<<<< HEAD
-=======
       elsif res.code == 410
         raise Webfinger::GoneError, "#{@uri} is gone from the server"
->>>>>>> v3.3.0
       else
         raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
       end
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 02caa3977..3301aaf51 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -88,7 +88,6 @@ class ResolveAccountService < BaseService
       @domain   = confirmed_domain
       return
     end
-  end
 
     # Account doesn't match, so it may have been redirected
     @webfinger         = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")