Update Dockerfile

Resolve the conflicts according to Duanbing's suggestion
cc-api · Feb 5, 2024 · d3e326c · d3e326c
1 parent fec37dc
commit d3e326c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/e2e-test/profile/Dockerfile b/test/e2e-test/profile/Dockerfile
@@ -11,11 +11,7 @@ RUN addgroup -S -g $GID $GROUP && adduser -S -u $UID -D -G $GROUP $USER
 RUN chown -R $USER:$GROUP ./
 
 RUN apk update && apk add bash vim
-<<<<<<< HEAD
 RUN pip install -r sdk/python3/requirements.txt && pip install pytest pytdxattest
-=======
-RUN pip install -r sdk/python3/requirements.txt && pip install pytest
->>>>>>> ddd915b (update e2e test)
 
 USER $UID