From 699db24ce782cd4870ff03ac8a9ddbf5c39b414a Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Tue, 20 Apr 2021 18:00:41 +0000
Subject: [PATCH] Fixed syntax error

---
 src/backend/cpu/platform/BasicCpuInfo.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp
index 7d393710..957e8a4a 100644
--- a/src/backend/cpu/platform/BasicCpuInfo.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo.cpp
@@ -329,7 +329,6 @@ xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm, uint3
 #   ifdef XMRIG_ALGO_CN_FEMTO
     if (f == Algorithm::CN_FEMTO) {
         return CpuThreads(count, 2);
->>>>>>> ace8409a56ebe216c7921b1c5320a4f9b4f2c152
     }
 #   endif