update action

LDO-CERT · Mar 27, 2024 · 94355c8 · 94355c8
2 parents 5755798 + 5c4b00a
commit 94355c8
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml
@@ -17,20 +17,13 @@ jobs:
         include:
           - dockerfile: ./compose/local/django/Dockerfile
             image: ghcr.io/LDO-CERT/orochi_django
-<<<<<<< HEAD
-          - dockerfile: ./compose/local/dask/Dockerfile
-            image: ghcr.io/LDO-CERT/orochi_worker
-          - dockerfile: ./compose/local/nginx/Dockerfile
-            image: ghcr.io/LDO-CERT/orochi_nginx
-=======
             name: ldo-cert/orochi_django
           - dockerfile: ./compose/local/dask/Dockerfile
             image: ghcr.io/LDO-CERT/orochi_worker
             name: ldo-cert/orochi_worker
           - dockerfile: ./compose/local/nginx/Dockerfile
             image: ghcr.io/LDO-CERT/orochi_nginx
             name: ldo-cert/orochi_nginx
->>>>>>> 5c4b00a8ce8aadcbf8306625e42c03b83a06d82a
     steps:
       - name: Checkout code
         uses: actions/checkout@v4