From a73d8fe4f6b762c5bf31eea5bc9e5f6cb67e83fa Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Fri, 28 Jul 2023 20:21:40 +0800
Subject: [PATCH] fix bug: join group failed

---
 .github/workflows/build-docker-image.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index d58bf7ad0..3dd64c930 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -47,8 +47,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-=======
->>>>>>> upstream/main
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with: