Update pr-ci-cd.yml

REAN-Foundation · Jul 29, 2024 · 0a3f067 · 0a3f067
1 parent 3814344
commit 0a3f067
Showing 1 changed file with 0 additions and 79 deletions.
diff --git a/.github/workflows/pr-ci-cd.yml b/.github/workflows/pr-ci-cd.yml
@@ -71,83 +71,4 @@ jobs:
           push: false
           tags: reancare/services:${{ steps.vars.outputs.branch }}_${{ steps.vars.outputs.sha_short }}
           cache-from: type=local,src=/tmp/.buildx-cache
-<<<<<<< HEAD
           cache-to: type=local,dest=/tmp/.buildx-cache
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-          cache-to: type=local,dest=/tmp/.buildx-cache
->>>>>>> main