remove more conflict markers

src/init.cpp

@@ -214,13 +214,8 @@ void Shutdown()
 
     StopTorControl();
 
-<<<<<<< Updated upstream
-    // After everything has been shut down, but before things get flushed
-    //2. stop scheduler and load block threads.
-=======
     // After everything has been shut down, but before things get flushed,
     //stop scheduler and load block threads.
->>>>>>> Stashed changes
     scheduler.stop();
 
     // After the threads that potentially access these pointers have been stopped,

src/test/checkqueue_tests.cpp

@@ -150,11 +150,7 @@ typedef CCheckQueue<FrozenCleanupCheck> FrozenCleanup_Queue;
  */
 static void Correct_Queue_range(std::vector<size_t> range)
 {
-<<<<<<< Updated upstream
-    auto small_queue = (new Correct_Queue{QUEUE_BATCH_SIZE, SCRIPT_CHECK_THREADS});
-=======
     auto small_queue = new Correct_Queue{QUEUE_BATCH_SIZE, SCRIPT_CHECK_THREADS};
->>>>>>> Stashed changes
 
     // Make vChecks here to save on malloc (this test can be slow...)
     std::vector<FakeCheckCheckCompletion> vChecks;
@@ -172,10 +168,7 @@ static void Correct_Queue_range(std::vector<size_t> range)
             BOOST_REQUIRE_EQUAL(FakeCheckCheckCompletion::n_calls, i);
         }
     }
-<<<<<<< Updated upstream
-=======
     delete small_queue;
->>>>>>> Stashed changes
 }
 
 /** Test that 0 checks is correct
@@ -238,10 +231,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_Catches_Failure)
             BOOST_REQUIRE(success);
         }
     }
-<<<<<<< Updated upstream
-=======
     delete fail_queue;
->>>>>>> Stashed changes
 }
 // Test that a block validation which fails does not interfere with
 // future blocks, ie, the bad state is cleared.
@@ -262,10 +252,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_Recovers_From_Failure)
             BOOST_REQUIRE(r != end_fails);
         }
     }
-<<<<<<< Updated upstream
-=======
     delete fail_queue;
->>>>>>> Stashed changes
 }
 
 // Test that unique checks are actually all called individually, rather than
@@ -295,10 +282,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_UniqueCheck)
         }
         BOOST_REQUIRE(r);
     }
-<<<<<<< Updated upstream
-=======
     delete queue;
->>>>>>> Stashed changes
 }
 
 
@@ -329,10 +313,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_Memory)
         }
         BOOST_REQUIRE_EQUAL(MemoryCheck::fake_allocated_memory, 0U);
     }
-<<<<<<< Updated upstream
-=======
     delete queue;
->>>>>>> Stashed changes
 }
 
 // Test that a new verification cannot occur until all checks
@@ -371,10 +352,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup)
     // Wait for control to finish
     t0.join();
     BOOST_REQUIRE(!fails);
-<<<<<<< Updated upstream
-=======
     delete queue;
->>>>>>> Stashed changes
 }
 
 

src/validation.cpp

@@ -1825,11 +1825,6 @@ void StartScriptCheckWorkerThreads(int threads_num)
     g_chainstate.scriptcheckqueue = std::make_unique< CCheckQueue<CScriptCheck> >(128, threads_num);
 }
 
-<<<<<<< Updated upstream
-=======
-CCheckQueue<CScriptCheck> *scriptcheckqueue =  g_chainstate.scriptcheckqueue.get();
->>>>>>> Stashed changes
-
 static unsigned int GetBlockScriptFlags(const CBlockIndex* pindex) {
     AssertLockHeld(cs_main);