From 54651d10026b184a5faccf026ab292152db80722 Mon Sep 17 00:00:00 2001
From: pit-ray <pit-ray@outlook.com>
Date: Sun, 12 May 2024 16:48:03 +0900
Subject: [PATCH] fix cmakelists.txt

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50f1c077..941e5145 100644
--- 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)