Skip to content

Commit 980a6dc

Browse files
committed
fix ecs test
1 parent 5b35047 commit 980a6dc

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ export PYTHON_BINARY=$PYTHON_VER
2929
export SET_XTRACE_ON=1
3030
cd src
3131
rm -rf .venv
32-
<<<<<<< HEAD
33-
bash ./.evergreen/just.sh setup-test auth_aws ecs
34-
||||||| 4e672bd54
35-
bash ./.evergreen/just.sh setup-test
36-
=======
3732
rm -f .evergreen/scripts/test-env.sh || true
38-
bash ./.evergreen/just.sh setup-test
39-
>>>>>>> 691ab8e783f01324b91f2178658957849d94ffeb
33+
bash ./.evergreen/just.sh setup-test auth_aws ecs
4034
bash .evergreen/just.sh test-eg

0 commit comments

Comments
 (0)