Resolve code changes from origin repository

77e0cd75 · Jerry Turcios · f5260ae7 · 1e893191 · 77e0cd75
Commit 77e0cd75 authored Oct 02, 2018 by Jerry Turcios
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CMakeLists.txt CMakeLists.txt +5 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,11 @@ endif (POLICY CMP0048)
 project(googletest-distribution)
 set(GOOGLETEST_VERSION 1.9.0)
+<<<<<<< HEAD
+=======
+add_compile_options(-std=c++11)
+>>>>>>> 1e893191c0a72f6c94bbd69acc39ce425594f36d
 enable_testing()