mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-04 03:27:21 -05:00 
			
		
		
		
	Update eps1lon/actions-label-merge-conflict action to v3.0.3
This commit is contained in:
		
							parent
							
								
									d22094be03
								
							
						
					
					
						commit
						b077d378fb
					
				
							
								
								
									
										2
									
								
								.github/workflows/pull-request-conflict.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/pull-request-conflict.yml
									
									
									
									
										vendored
									
									
								
							@ -15,7 +15,7 @@ jobs:
 | 
				
			|||||||
    if: ${{ github.repository == 'jellyfin/jellyfin' }}
 | 
					    if: ${{ github.repository == 'jellyfin/jellyfin' }}
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Apply label
 | 
					      - name: Apply label
 | 
				
			||||||
        uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
 | 
					        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
 | 
				
			||||||
        if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
 | 
					        if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          dirtyLabel: 'merge conflict'
 | 
					          dirtyLabel: 'merge conflict'
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user