mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 03:16:10 -06:00 
			
		
		
		
	Fixes the merge issues
This commit is contained in:
		
							
								
								
									
										3
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							@@ -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 }}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user