# Conflicts are resolved: libraries/chain/db_maint.cpp libraries/chain/db_witness_schedule.cpp libraries/chain/include/graphene/chain/database.hpp libraries/chain/include/graphene/chain/global_property_object.hpp libraries/chain/include/graphene/chain/son_object.hpp libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp libraries/wallet/wallet.cpp |
||
|---|---|---|
| .. | ||
| bitcoin | ||
| common | ||
| hive | ||
| include/graphene/peerplays_sidechain | ||
| CMakeLists.txt | ||
| peerplays_sidechain_plugin.cpp | ||
| sidechain_net_handler.cpp | ||
| sidechain_net_handler_bitcoin.cpp | ||
| sidechain_net_handler_hive.cpp | ||
| sidechain_net_handler_peerplays.cpp | ||
| sidechain_net_manager.cpp | ||