From 06882f2c87c340e5c35486b83cb32a6e6883c41e Mon Sep 17 00:00:00 2001
From: Eswar Prakash <admin@eswarprakash.com>
Date: Sat, 11 Mar 2023 10:50:19 +0000
Subject: [PATCH] Update CMakeLists

---
 .idea/vcs.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index cbff04f..8306744 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-<<<<<<< HEAD
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-=======
->>>>>>> cea68f2 (Support for win32)
   </component>
 </project>
\ No newline at end of file