Remove compilation option for C++11 in the root CMakeLists.txt

9f8512d7 · Jerry Turcios · 77e0cd75 · 9f8512d7
Commit 9f8512d7 authored Oct 02, 2018 by Jerry Turcios
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

CMakeLists.txt CMakeLists.txt +0 -5

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,11 +6,6 @@ endif (POLICY CMP0048)

 project(googletest-distribution)
 set(GOOGLETEST_VERSION 1.9.0)
-<<<<<<< HEAD
-=======
-
-add_compile_options(-std=c++11)
->>>>>>> 1e893191c0a72f6c94bbd69acc39ce425594f36d

 enable_testing()