fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed merge artifact

Browse source
This commit is contained in:
MoneroOcean 2018-10-02 07:30:23 +02:00
parent fa5cc9c4e6
commit fb004deef3
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/Config.cpp
View file

@ -125,7 +125,6 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
doc.AddMember("retry-pause", retryPause(), allocator);
doc.AddMember("safe", m_safe, allocator);
<<<<<<< HEAD
// save extended "threads" based on m_threads
Value threads(kObjectType);
for (int a = 0; a != xmrig::Algo::ALGO_MAX; ++ a) {