merge fix

dymensionxyz · Oct 22, 2024 · 060a11f · 060a11f
1 parent 5ccff43
commit 060a11f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/settlement/grpc/grpc.go b/settlement/grpc/grpc.go
@@ -307,11 +307,7 @@ func (c *Client) saveBatch(batch *settlement.Batch) error {
 }
 
 func (c *Client) convertBatchtoSettlementBatch(batch *types.Batch, daResult *da.ResultSubmitBatch) *settlement.Batch {
-<<<<<<< HEAD
 	bds := []rollapp.BlockDescriptor{}
-=======
-	bds := []settlement.BlockDescriptor{}
->>>>>>> 9270799 (checkin missed error)
 	for _, block := range batch.Blocks {
 		bd := rollapp.BlockDescriptor{
 			Height:    block.Header.Height,