Merge pull request #98 from ckan/Remove-conflicted-files

Remove extra (conflicted copy) Dockerfiles from the repo
ckan · Dec 3, 2024 · af49d19 · af49d19
2 parents bf7446f + 6b09860
commit af49d19
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 714 deletions.
diff --git a/ckan-2.10/Dockerfile (Brett’s MacBook Pro's conflicted copy 2024-11-29) b/ckan-2.10/Dockerfile (Brett’s MacBook Pro's conflicted copy 2024-11-29)
diff --git a/ckan-2.10/Dockerfile.py3 (Brett’s MacBook Pro's conflicted copy 2024-11-29).10 b/ckan-2.10/Dockerfile.py3 (Brett’s MacBook Pro's conflicted copy 2024-11-29).10