Fix merge conflicts

2021-12-02 10:30:58 -05:00
parent 8fa74af815 c3dda12f35
commit dbe14d4935
4 changed files with 34 additions and 58 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ testing.sh
 tests
 mwe*
 test*
-container*
+container*
+Containerfile