Merge pull request #1804

12adb4a3 core: move hardfork back to cryptonote_core (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-03 14:11:09 +02:00
commit 3787ffca80
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
8 changed files with 10 additions and 10 deletions

View file

@ -34,7 +34,7 @@
#include "daemon/rpc_command_executor.h"
#include "rpc/core_rpc_server_commands_defs.h"
#include "cryptonote_core/cryptonote_core.h"
#include "cryptonote_basic/hardfork.h"
#include "cryptonote_core/hardfork.h"
#include <boost/format.hpp>
#include <ctime>
#include <string>