Fixed syntax error

2021-04-20 18:00:41 +00:00 · 2021-04-20 18:00:41 +00:00 · 699db24ce7
commit 699db24ce7
parent bc20f3a1d5
1 changed files with 0 additions and 1 deletions
--- 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