xx

Joe-Abraham · Sep 18, 2024 · e3052fd · e3052fd
1 parent 62b2cd0
commit e3052fd
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/velox/common/encode/tests/CMakeLists.txt b/velox/common/encode/tests/CMakeLists.txt
@@ -12,12 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-add_executable(velox_common_encode_test Base64Test.cpp
-                                        EncoderUtilsTests.cpp)
-=======
 add_executable(velox_common_encode_test Base64Test.cpp EncoderUtilsTests.cpp)
->>>>>>> 8b8b9e13d (Introduce utility class for encoding)
 add_test(velox_common_encode_test velox_common_encode_test)
 target_link_libraries(
   velox_common_encode_test