refactor: addressing code review

#7441 (review) License: MIT Signed-off-by: Marcin Rataj <lidel@lidel.org>
ipfs · Jul 13, 2020 · 0859059 · 0859059
1 parent 5cd130d
commit 0859059
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/core/corehttp/hostname_test.go b/core/corehttp/hostname_test.go
@@ -180,9 +180,5 @@ func TestKnownSubdomainDetails(t *testing.T) {
 }
 
 func equalError(a, b error) bool {
-<<<<<<< HEAD
 	return (a == nil && b == nil) || (a != nil && b != nil && a.Error() == b.Error())
-=======
-	return a == nil && b == nil || a != nil && b != nil && a.Error() == b.Error()
->>>>>>> feat: support ED25519 at subdomain gw with TLS
 }