fix conflact

JukLee0ira · JukLee0ira · commit bfce8542c593 · 2025-08-05T03:30:23.000-04:00
diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go
@@ -145,7 +145,6 @@ func WriteHeadFastBlockHash(db ethdb.KeyValueWriter, hash common.Hash) {
 	}
 }
 
-<<<<<<< HEAD
 // ReadFastTrieProgress retrieves the number of tries nodes fast synced to allow
 // reportinc correct numbers across restarts.
 func ReadFastTrieProgress(db ethdb.KeyValueReader) uint64 {
@@ -176,8 +175,6 @@ func WriteLastPivotNumber(db ethdb.KeyValueWriter, pivot uint64) {
 	}
 }
 
-=======
->>>>>>> 9ea89b0e8 (fix)
 // ReadHeaderRLP retrieves a block header in its raw RLP database encoding.
 func ReadHeaderRLP(db ethdb.Reader, hash common.Hash, number uint64) rlp.RawValue {
 	// First try to look up the data in ancient database. Extra hash

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,6 @@ func WriteHeadFastBlockHash(db ethdb.KeyValueWriter, hash common.Hash) {`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`-<<<<<<< HEAD`
`149`	`148`	`// ReadFastTrieProgress retrieves the number of tries nodes fast synced to allow`
`150`	`149`	`// reportinc correct numbers across restarts.`
`151`	`150`	`func ReadFastTrieProgress(db ethdb.KeyValueReader) uint64 {`
`@@ -176,8 +175,6 @@ func WriteLastPivotNumber(db ethdb.KeyValueWriter, pivot uint64) {`
`176`	`175`	`}`
`177`	`176`	`}`
`178`	`177`
`179`		`-=======`
`180`		`->>>>>>> 9ea89b0e8 (fix)`
`181`	`178`	`// ReadHeaderRLP retrieves a block header in its raw RLP database encoding.`
`182`	`179`	`func ReadHeaderRLP(db ethdb.Reader, hash common.Hash, number uint64) rlp.RawValue {`
`183`	`180`	`// First try to look up the data in ancient database. Extra hash`