merge

2017-01-09 20:29:52 +00:00 · 2017-01-09 20:29:52 +00:00 · 8dc3503eb7
commit 8dc3503eb7
parent 53039d3785
1 changed files with 0 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -112,10 +112,6 @@ if (WIN32)
  list (APPEND YLIBS    $<TARGET_OBJECTS:YapC++>)
 endif()

-<<<<<<< HEAD
-	
-=======
->>>>>>> 6aaa32363c7e98297e48a79ea03ae55de59fbdb3

 add_component (core
  ${ENGINE_SOURCES}