From: Trenton Holmes <holmes.trenton@gmail.com>
Date: Mon, 25 Apr 2022 18:39:05 +0000 (-0700)
Subject: Fixes the merge issues
X-Git-Tag: v1.8.0-beta.rc1~164^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F761%2Fhead;p=thirdparty%2Fpaperless-ngx.git

Fixes the merge issues
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2c25acb46..34bcf21a27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -266,9 +266,6 @@ jobs:
 
   # build and push image to docker hub.
   build-docker-image:
-    concurrency:
-      group: ${{ github.workflow }}-build-docker-image-${{ github.ref }}
-      cancel-in-progress: true
     runs-on: ubuntu-20.04
     concurrency:
       group: ${{ github.workflow }}-build-docker-image-${{ github.ref_name }}