chore: resolve conflics

vitwit · Sep 17, 2024 · 2c78b13 · 2c78b13
1 parent cd52294
commit 2c78b13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/keeper/abci.go b/keeper/abci.go
@@ -119,7 +119,6 @@ func (k *Keeper) PreBlocker(ctx sdk.Context, req *abci.RequestFinalizeBlock) err
 	}
 
 	var blocksToSumit []int64
-<<<<<<< HEAD
 
 	for i := fromHeight; i < endHeight; i++ {
 		blocksToSumit = append(blocksToSumit, int64(i))
@@ -130,18 +129,6 @@ func (k *Keeper) PreBlocker(ctx sdk.Context, req *abci.RequestFinalizeBlock) err
 		k.relayer.PostBlocks(ctx, blocksToSumit, k.cdc, req.ProposerAddress)
 	}
 
-=======
-
-	for i := fromHeight; i < endHeight; i++ {
-		blocksToSumit = append(blocksToSumit, int64(i))
-	}
-
-	// only the proposer should be able to post the blocks
-	if bytes.Equal(req.ProposerAddress, k.proposerAddress) {
-		k.relayer.PostBlocks(ctx, blocksToSumit, k.cdc, req.ProposerAddress)
-	}
-
->>>>>>> da99450ba7959eeb555a583f0724cc95e34110a2
 	return nil
 }
 

diff --git a/types/genesis.pb.go b/types/genesis.pb.go
diff --git a/types/query.pb.go b/types/query.pb.go