From 1df52c1f2838a73ffa19a813bf53dab7b9a01bfd Mon Sep 17 00:00:00 2001
From: Oleg Alexandrov <oleg.alexandrov@gmail.com>
Date: Thu, 15 Jul 2021 11:30:42 -0700
Subject: [PATCH] Bump up cmake requirement to 3.15 and fix the conda env
 command

Fix some stray edit
---
 README.md       | 6 +++---
 environment.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9a13901..512a92b 100644
--- a/README.md
+++ b/README.md
@@ -45,9 +45,9 @@ GBs.
 
 ## Build Requirements
 
-* cmake 3.10 or newer
+* cmake 3.15 or newer
 * GNU-compatible Make
-* a c++11 compliant compiler
+* a C++11 compliant compiler
 
 This repository has all of its external c++ dependencies included in it. The
 excellent header-only JSON library
@@ -65,7 +65,7 @@ be available within the source code. You can remove the googletest dependency
 by disabling the tests.
 
 ```
-conda env create -n usgscsm -f environment.yml -y
+conda env create -n usgscsm -f environment.yml
 ```
 
 ## Building USGSCSM
diff --git a/environment.yml b/environment.yml
index 6709a92..ccb7e68 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,7 +4,7 @@ channels:
   - default
 
 dependencies:
-  - cmake>=3.12
+  - cmake>=3.15
   - ale
   - csm
   - nlohmann_json
-- 
GitLab