From d3e326c4cfce14f977ae1cc27b504cfc842ad2d4 Mon Sep 17 00:00:00 2001
From: Wenhui Zhang <wenhuizhang.psu@gmail.com>
Date: Mon, 5 Feb 2024 14:42:27 -0800
Subject: [PATCH] Update Dockerfile

Resolve the conflicts according to Duanbing's suggestion
---
 test/e2e-test/profile/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/e2e-test/profile/Dockerfile b/test/e2e-test/profile/Dockerfile
index 0878aa1..b6df9ca 100644
--- 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