Resolve merge conflict

status-im · Jul 31, 2024 · 44bb3be · 44bb3be
1 parent 268c1b8
commit 44bb3be
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/nimbus/nimbus_import.nim b/nimbus/nimbus_import.nim
@@ -281,9 +281,6 @@ proc importBlocks*(conf: NimbusConf, com: CommonRef) =
       if blocks.len > 0:
         process() # last chunk, if any
 
-<<<<<<< HEAD
-  importRlpBlocks(conf, com)
-=======
     if blockNumber > lastEra1Block:
       notice "Importing era archive",
         start, dataDir = conf.dataDir.string, eraDir = conf.eraDir.string
@@ -327,10 +324,4 @@ proc importBlocks*(conf: NimbusConf, com: CommonRef) =
       if blocks.len > 0:
         process()
 
-  for blocksFile in conf.blocksFile:
-    if isFile(string blocksFile):
-      # success or not, we quit after importing blocks
-      if not importRlpBlock(string blocksFile, com):
-        quit(QuitFailure)
-      else:
-        quit(QuitSuccess)
+  importRlpBlocks(conf, com)