From c1f62a985c46f8b463806f2bb02ecb52778f095a Mon Sep 17 00:00:00 2001
From: bernd-m <43466467+bermuell@users.noreply.github.com>
Date: Thu, 14 Dec 2023 18:00:12 +0100
Subject: [PATCH] Fix merge issues on genesis_test.go

---
 app/consumer/genesis_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/consumer/genesis_test.go b/app/consumer/genesis_test.go
index 806d705e1c..afd5dec34e 100644
--- a/app/consumer/genesis_test.go
+++ b/app/consumer/genesis_test.go
@@ -215,9 +215,6 @@ func TestConsumerGenesisTransformationV2(t *testing.T) {
 
 	require.Empty(t, consumerGenesis.InitialValSet)
 	require.NotEmpty(t, consumerGenesis.Provider.InitialValSet)
-<<<<<<< HEAD
-=======
 	require.Equal(t, consumerGenesis.Params.RetryDelayPeriod, ccvtypes.DefaultRetryDelayPeriod)
 	require.Equal(t, consumerGenesis.NewChain, oldConsumerGenesis["new_chain"])
->>>>>>> f86c61f (fix: missing transformation for field 'new_chain' in ccv consumer genesis (#1509))
 }