Resolve code changes from origin repository

2018-10-02 22:12:06 -04:00 · 2018-10-02 22:12:06 -04:00 · 1d53c045b3
commit 1d53c045b3
parent 962abd75d8 25ff155350
1 changed files with 5 additions and 0 deletions
--- 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()