resolve the stuff what the heck man

MaikRe · Oct 14, 2024 · 6847c28 · 6847c28
1 parent 8607729
commit 6847c28
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -41,13 +41,7 @@ jobs:
       - self-hosted
       - v3
     container:
-<<<<<<< HEAD
-      image: ghcr.io/hulks/hulk-ci:1.78.0
-||||||| parent of 6aacf9c6c (Use rust 1.80 CI image)
-      image: 134.28.57.223:5000/hulk:1.78.0
-=======
-      image: 134.28.57.223:5000/hulk:1.80.0
->>>>>>> 6aacf9c6c (Use rust 1.80 CI image)
+      image: ghcr.io/hulks/hulk-ci:1.80.0
       options: --user=1000:1000
     steps:
       - uses: actions/checkout@v4
@@ -64,13 +58,7 @@ jobs:
       - self-hosted
       - v3
     container:
-<<<<<<< HEAD
-      image: ghcr.io/hulks/hulk-ci:1.78.0
-||||||| parent of 6aacf9c6c (Use rust 1.80 CI image)
-      image: 134.28.57.223:5000/hulk:1.78.0
-=======
-      image: 134.28.57.223:5000/hulk:1.80.0
->>>>>>> 6aacf9c6c (Use rust 1.80 CI image)
+      image: ghcr.io/hulks/hulk-ci:1.80.0
       options: --user=1000:1000
     steps:
       - uses: actions/checkout@v4