fix merge errors, update recommended version to 0.14.0.2

2019-03-05 13:46:35 +02:00
parent f3b368c659
commit 082149c580
2 changed files with 5 additions and 5 deletions
@@ -4698,7 +4698,7 @@ void Blockchain::cancel()

 #if defined(PER_BLOCK_CHECKPOINT)
 static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0";
-void Blockchain::load_compiled_in_block_hashes()
+void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
 {
  if (get_checkpoints == nullptr || !m_fast_sync)
  {