diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ac379de..afc6ab69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ PROJECT(AETHYRA) +<<<<<<< HEAD:CMakeLists.txt SET(VERSION 0.0.27) +======= +SET(VERSION 0.0.26) +>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:CMakeLists.txt # where to look for cmake modules SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) |