Fix merge issues on genesis_test.go

cosmos · Dec 14, 2023 · c1f62a9 · c1f62a9
1 parent 85a4af6
commit c1f62a9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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))
 }