Remove commented code from draft merged. Restore code from master

graft-project · May 13, 2019 · 3cd9e23 · 3cd9e23
1 parent e14e92a
commit 3cd9e23
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
@@ -191,19 +191,6 @@ namespace cryptonote
               m_update_download(0),
               m_nettype(UNDEFINED),
               m_update_available(false)
-/*
-              m_threadpool(tools::threadpool::getInstance()),
-              m_update_download(0),
-              m_nettype(UNDEFINED)
-
-||| merged common ancestors
-              m_threadpool(tools::threadpool::getInstance()),
-              m_update_download(0)
-===
-              m_update_download(0),
-              m_nettype(UNDEFINED),
-              m_update_available(false)
-*/
   {
     m_checkpoints_updating.clear();
     set_cryptonote_protocol(pprotocol);