From 1b015106aaa10c475d45d8d8eb603e062a3964d4 Mon Sep 17 00:00:00 2001
From: ghost <paddymchale@hotmail.com>
Date: Thu, 7 Nov 2024 12:10:01 +0000
Subject: [PATCH] fix: merge error

---
 state/txindex/kv/kv.go | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go
index a6021d882ec..d305acbdd23 100644
--- a/state/txindex/kv/kv.go
+++ b/state/txindex/kv/kv.go
@@ -397,20 +397,11 @@ type TxInfo struct {
 
 func (*TxIndex) setTmpHashes(tmpHeights map[string]TxInfo, key, value []byte, height int64) {
 	eventSeq := extractEventSeqFromKey(key)
-<<<<<<< HEAD
 	txInfo := TxInfo{
 		TxBytes: value,
 		Height:  height,
 	}
 	tmpHeights[string(value)+eventSeq] = txInfo
-=======
-
-	// Copy the value because the iterator will be reused.
-	valueCopy := make([]byte, len(value))
-	copy(valueCopy, value)
-
-	tmpHeights[string(valueCopy)+eventSeq] = valueCopy
->>>>>>> upstream/v0.38.x
 }
 
 // match returns all matching txs by hash that meet a given condition and start