From ffdf22afc38128731e3dc6e9e027a014abbd3835 Mon Sep 17 00:00:00 2001 From: Nic Barker Date: Mon, 30 Dec 2024 13:24:12 +1300 Subject: [PATCH] remove merge marker --- examples/introducing-clay-video-demo/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/introducing-clay-video-demo/CMakeLists.txt b/examples/introducing-clay-video-demo/CMakeLists.txt index 0883c87..859165e 100644 --- a/examples/introducing-clay-video-demo/CMakeLists.txt +++ b/examples/introducing-clay-video-demo/CMakeLists.txt @@ -24,7 +24,6 @@ target_compile_options(clay_examples_introducing_clay_video_demo PUBLIC) target_include_directories(clay_examples_introducing_clay_video_demo PUBLIC .) target_link_libraries(clay_examples_introducing_clay_video_demo PUBLIC raylib) -<<<<<<< HEAD set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror -Wno-error=missing-braces -DCLAY_DEBUG") set(CMAKE_C_FLAGS_RELEASE "-O3")