From 6a40b007e62b616780c0ae6e6ec2f6a0f31325ee Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Mon, 25 Jan 2021 18:57:12 +0000 Subject: [PATCH] Resolve conflicts --- tests/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2d13282d28..c9a07b49ef 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -79,11 +79,8 @@ if(WITH_PYTHON) add_fdb_test(TEST_FILES SampleNoSimAttrition.txt IGNORE) if (NOT USE_UBSAN) # TODO re-enable in UBSAN after https://github.com/apple/foundationdb/issues/2410 is resolved add_fdb_test(TEST_FILES SimpleExternalTest.txt) -<<<<<<< HEAD else() add_fdb_test(TEST_FILES SimpleExternalTest.txt IGNORE) -======= ->>>>>>> release-6.3 endif() add_fdb_test(TEST_FILES SlowTask.txt IGNORE) add_fdb_test(TEST_FILES SpecificUnitTest.txt IGNORE)