Merge branch 'beharrop/atm/cre_experiments' into cre_update_v1

beharrop · Oct 17, 2023 · 0fca3e2 · 0fca3e2
2 parents 4431fdb + ddf15ee
commit 0fca3e2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/cime/config/e3sm/machines/config_machines.xml b/cime/config/e3sm/machines/config_machines.xml
@@ -445,11 +445,8 @@
       <command name="load">cray-hdf5-parallel/1.10.5.2</command>
       <command name="load">cray-parallel-netcdf/1.11.1.1</command>
     </modules>
-<<<<<<< HEAD
 
-=======
 
->>>>>>> c300256e2b (Merge in updates to machine files for running on Cori after maintenance)
     <modules>
       <command name="rm">cmake</command>
       <command name="load">cmake</command>