From 3382249a977a24c66eb1797a1af61338952771c1 Mon Sep 17 00:00:00 2001
From: Charles Billette <charles@cbillette.com>
Date: Tue, 20 Aug 2024 08:07:56 -0400
Subject: [PATCH] fix compilation issue

---
 cmd/firesol/upgrader.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cmd/firesol/upgrader.go b/cmd/firesol/upgrader.go
index 7ff2632..ba742a3 100644
--- 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)