From 18413f26e8100ae8b5f2abd147b413b0ddde6230 Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Thu, 10 Oct 2019 14:54:19 -0700
Subject: [PATCH] Merged v4.3.0-beta

---
 src/backend/cpu/CpuConfig.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/backend/cpu/CpuConfig.cpp b/src/backend/cpu/CpuConfig.cpp
index c6bc21b8..e9abd9e6 100644
--- a/src/backend/cpu/CpuConfig.cpp
+++ b/src/backend/cpu/CpuConfig.cpp
@@ -43,31 +43,6 @@ static const char *kPriority            = "priority";
 static const char *kAsm = "asm";
 #endif
 
-<<<<<<< HEAD
-#ifdef XMRIG_ALGO_CN_GPU
-static const char *kCnGPU = "cn/gpu";
-#endif
-
-#ifdef XMRIG_ALGO_CN_LITE
-static const char *kCnLite = "cn-lite";
-#endif
-
-#ifdef XMRIG_ALGO_CN_HEAVY
-static const char *kCnHeavy = "cn-heavy";
-#endif
-
-#ifdef XMRIG_ALGO_CN_PICO
-static const char *kCnPico = "cn-pico";
-#endif
-
-#ifdef XMRIG_ALGO_RANDOMX
-static const char *kRx    = "rx";
-static const char *kRxWOW = "rx/wow";
-static const char *kDefyX = "defyx";
-#endif
-
-=======
->>>>>>> 72b7d934f615de1e17cf14453a8776e8ce0ad937
 #ifdef XMRIG_ALGO_ARGON2
 static const char *kArgon2Impl = "argon2-impl";
 #endif