Skip to content

Commit

Permalink
Merge branch 'jgfouca/cime/remove_zombie_files' into master (PR #1855)
Browse files Browse the repository at this point in the history
These files were deleted on the ESMCI side

... but somehow remained on the ACME side and continue to cause
problems in the merges. Delete them manually with this commit.

Fixes #1853

[BFB]

* jgfouca/cime/remove_zombie_files:
  These files were deleted on the ESMCI side
  • Loading branch information
jgfouca committed Oct 18, 2017
2 parents 4872431 + 2e003ee commit 4b50282
Show file tree
Hide file tree
Showing 33 changed files with 0 additions and 5,584 deletions.
108 changes: 0 additions & 108 deletions scripts/Testing/Testcases/ICP_script

This file was deleted.

109 changes: 0 additions & 109 deletions scripts/Testing/Testcases/LAR_script

This file was deleted.

89 changes: 0 additions & 89 deletions scripts/Testing/Testcases/OCP_script

This file was deleted.

39 changes: 0 additions & 39 deletions scripts/Testing/Testcases/README

This file was deleted.

Loading

0 comments on commit 4b50282

Please sign in to comment.