Merge branch 'master' of mc.felinewith.me:LadySerenaKitty/nitrogen

CMakeLists.txt

@@ -5,9 +5,12 @@ execute_process(COMMAND ./ver.sh OUTPUT_VARIABLE GIT_COMMIT OUTPUT_STRIP_TRAILIN
 set(CMAKE_PROJECT_VERSION_TWEAK ${GIT_COMMIT})
 set(CMAKE_PROJECT_VERSION_TWEAK ${GIT_COMMIT})
 set(PROJECT_VERSION_TWEAK ${GIT_COMMIT})
 set(PROJECT_VERSION_TWEAK ${GIT_COMMIT})
 set(Nitrogen_VERSION_TWEAK ${GIT_COMMIT})
 set(Nitrogen_VERSION_TWEAK ${GIT_COMMIT})
+<<<<<<< HEAD
 
 
 configure_file(Doxyfile.in Doxyfile)
 configure_file(Doxyfile.in Doxyfile)
 execute_process(COMMAND doxygen ${CMAKE_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 execute_process(COMMAND doxygen ${CMAKE_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+=======
+>>>>>>> be9c14e16a3d4dadc0602a50386ba5b6cbaaed53
 
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD 11)