Update CMakeLists.txt...

Author: TApplencourt

CMakeLists.txt

@@ -144,17 +144,16 @@ add_cts_option(SYCL_CTS_ENABLE_KHR_QUEUE_EMPTY_QUERY_TESTS
     "Enable extension Khronos queue_empty_query tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
 
-<<<<<<< khr_queue_flush
-add_cts_option(SYCL_CTS_ENABLE_KHR_QUEUE_FLUSH_TESTS
-    "Enable extension Khronos queue_flush tests" OFF
-=======
 add_cts_option(SYCL_CTS_ENABLE_KHR_MAX_WORK_GROUP_QUERIES_TESTS
     "Enable extension Khronos max_work_group_query tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
 
 add_cts_option(SYCL_CTS_ENABLE_KHR_WORK_ITEM_QUERIES_TESTS
     "Enable extension Khronos work_item_queries tests" OFF
->>>>>>> main
+    FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
+
+add_cts_option(SYCL_CTS_ENABLE_KHR_QUEUE_FLUSH_TESTS
+    "Enable extension Khronos queue_flush tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
 
 # TODO: Deprecated - remove