mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-04 03:27:21 -05:00 
			
		
		
		
	Bump eps1lon/actions-label-merge-conflict from v2.0.0 to v2.0.1
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from v2.0.0 to v2.0.1. - [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases) - [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md) - [Commits](https://github.com/eps1lon/actions-label-merge-conflict/compare/v2.0.0...b8bf8341285ec9a4567d4318ba474fee998a6919) Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
		
							parent
							
								
									9b4f1bbf19
								
							
						
					
					
						commit
						1d4c8dcde3
					
				
							
								
								
									
										2
									
								
								.github/workflows/merge-conflicts.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/merge-conflicts.yml
									
									
									
									
										vendored
									
									
								
							@ -11,7 +11,7 @@ jobs:
 | 
				
			|||||||
  triage:
 | 
					  triage:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: eps1lon/actions-label-merge-conflict@v2.0.0
 | 
					      - uses: eps1lon/actions-label-merge-conflict@v2.0.1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          dirtyLabel: 'merge conflict'
 | 
					          dirtyLabel: 'merge conflict'
 | 
				
			||||||
          repoToken: ${{ secrets.GH_TOKEN }}
 | 
					          repoToken: ${{ secrets.GH_TOKEN }}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user