Fixed merge glitch.

Changes to be committed: modified: Base/JackrabbitOliverTwist
rapmd73 · Sep 23, 2024 · ebd35b5 · ebd35b5
1 parent 1cf2356
commit ebd35b5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Base/JackrabbitOliverTwist b/Base/JackrabbitOliverTwist
@@ -579,11 +579,7 @@ def main():
 
         EndTime=datetime.datetime.now()
         Elapsed=(EndTime-StartTime)
-<<<<<<< HEAD
-#        if len(idx)>NumberProcesses:
-=======
 #        if len(idx)>(NumberProcesses*3):
->>>>>>> 5d61423a9edba516e8e042b0785b61fad6cfaa1e
 #            JRLog.Write(f"{len(StorehouseIDX)} assets scanned in "+str(Elapsed)+" seconds")
 
         JRRsupport.ElasticSleep(1)