cmake: replace WITH_CPP_REDIS with WITH_RADOSGW_D4N_FILTER

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20219c7ac5e30057aef6263a23eb9c250e5d856b..25af73a28aea034215e857675e354a56e83fdc40 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -296,7 +296,6 @@ if(WITH_CEPHFS_JAVA)
 endif()
 
 if(WITH_RADOSGW_D4N)
->>>>>>> f409ee2d871 (RGW: Update D4N files and cpp_redis submodule)
   add_subdirectory(cpp_redis)
 endif()