From fb004deef32642f7f56081e8ad68bb14884d265e Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Tue, 2 Oct 2018 07:30:23 +0200
Subject: [PATCH] Removed merge artifact

---
 src/core/Config.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index 39f2c751..84600076 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -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) {