fix compilation issue

streamingfast · Aug 20, 2024 · 3382249 · 3382249
1 parent 616154f
commit 3382249
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/cmd/firesol/upgrader.go b/cmd/firesol/upgrader.go
@@ -83,11 +83,7 @@ func tweakBlock(block *pbbstream.Block) (*pbbstream.Block, error) {
 	block.ParentNum = b.ParentSlot
 
 	slices.SortFunc(b.Rewards, func(a, b *pbsol.Reward) int {
-<<<<<<< HEAD
 		return cmp.Compare(a.Lamports, b.Lamports)
-=======
-		return int(a.Lamports - b.Lamports)
->>>>>>> 1e3fca7 (Now use multiple endpoints. This should help with block not available at certain time.)
 	})
 
 	err = block.Payload.MarshalFrom(b)