From 0859059c3a2865a757cd447f8570c17675f7a518 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Wed, 1 Jul 2020 13:06:11 +0200
Subject: [PATCH] refactor: addressing code review

https://github.com/ipfs/go-ipfs/pull/7441#pullrequestreview-440043209

License: MIT
Signed-off-by: Marcin Rataj <lidel@lidel.org>
---
 core/corehttp/hostname_test.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/corehttp/hostname_test.go b/core/corehttp/hostname_test.go
index 9c181702db1..cf00e827121 100644
--- 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
 }