From 1e893191c0a72f6c94bbd69acc39ce425594f36d Mon Sep 17 00:00:00 2001
From: Jerry Turcios <jerryturcios08@gmail.com>
Date: Tue, 2 Oct 2018 15:11:11 -0400
Subject: [PATCH 1/3] Add compilation option for C++11 in the root
 CMakeLists.txt

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6b938f2..e8554748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,8 @@ endif (POLICY CMP0048)
 
 project(googletest-distribution)
 set(GOOGLETEST_VERSION 1.9.0)
-set(CMAKE_CXX_STANDARD 11 CACHE STRING "Set the C++ standard to be used for compiling")
+
+add_compile_options(-std=c++11)
 
 enable_testing()
 

From 9f8512d7c53df3bfb6668aa5ee503b11380ae62b Mon Sep 17 00:00:00 2001
From: Jerry Turcios <jerryturcios08@gmail.com>
Date: Tue, 2 Oct 2018 23:43:01 -0400
Subject: [PATCH 2/3] Remove compilation option for C++11 in the root
 CMakeLists.txt

---
 CMakeLists.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b498cfe..d7732116 100644
--- 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()
 

From 11319f1c6349ca7cebab40315af0557a11bc9aa3 Mon Sep 17 00:00:00 2001
From: Jerry Turcios <jerryturcios08@gmail.com>
Date: Wed, 31 Oct 2018 12:56:21 -0400
Subject: [PATCH 3/3] Correct grammatical error in README.md

---
 googlemock/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/googlemock/README.md b/googlemock/README.md
index fced671c..b18be27b 100644
--- a/googlemock/README.md
+++ b/googlemock/README.md
@@ -35,7 +35,7 @@ We hope you find it useful!
   * Does automatic verification of expectations (no record-and-replay needed).
   * Allows arbitrary (partial) ordering constraints on
     function calls to be expressed,.
-  * Lets an user extend it by defining new matchers and actions.
+  * Lets a user extend it by defining new matchers and actions.
   * Does not use exceptions.
   * Is easy to learn and use.