[cmake] fix 9c934e5

TRIQS · May 16, 2024 · 8fb0bc3 · 8fb0bc3
1 parent 9c934e5
commit 8fb0bc3
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,11 +27,7 @@ endif()
 
 # ############
 # Define Project
-<<<<<<< Updated upstream
-project(triqs_dft_tools VERSION 3.3.0 LANGUAGES C CXX Fortran)
-=======
-project(triqs_dft_tools VERSION 3.2.0 LANGUAGES CXX Fortran)
->>>>>>> Stashed changes
+project(triqs_dft_tools VERSION 3.3.0 LANGUAGES CXX Fortran)
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
 # ############