fix merge conflict

E3SM-Project · Jul 18, 2016 · fd7dd06 · fd7dd06
2 parents fb3aeea + 8b6d137
commit fd7dd06
Show file tree

Hide file tree

Showing 16 changed files with 263 additions and 931 deletions.
diff --git a/cime_config/acme/machines/cesm_postbuild b/cime_config/acme/machines/cesm_postbuild
diff --git a/cime_config/acme/machines/cesm_postbuild.perf_archive b/cime_config/acme/machines/cesm_postbuild.perf_archive
diff --git a/cime_config/acme/machines/cesm_postrun b/cime_config/acme/machines/cesm_postrun
diff --git a/cime_config/acme/machines/cesm_postrun.perf_archive b/cime_config/acme/machines/cesm_postrun.perf_archive
diff --git a/cime_config/acme/machines/cesm_postrun2 b/cime_config/acme/machines/cesm_postrun2