fix cmakelists.txt

pit-ray · May 12, 2024 · 54651d1 · 54651d1
1 parent 5208080
commit 54651d1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.6.0)
-<<<<<<< HEAD
 project(win-vind VERSION 5.13.0)
 set(INTERNAL_VERSION ${PROJECT_VERSION}.1)