mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-04 03:27:21 -05:00 
			
		
		
		
	fix merge duplication
This commit is contained in:
		
							parent
							
								
									885ea9f6ba
								
							
						
					
					
						commit
						2d9f7d678c
					
				@ -43,7 +43,6 @@ namespace MediaBrowser.Controller.Resolvers
 | 
				
			|||||||
                ".flv",
 | 
					                ".flv",
 | 
				
			||||||
                ".f4v",
 | 
					                ".f4v",
 | 
				
			||||||
                ".3gp",
 | 
					                ".3gp",
 | 
				
			||||||
                ".rec",
 | 
					 | 
				
			||||||
                ".webm",
 | 
					                ".webm",
 | 
				
			||||||
                ".mts",
 | 
					                ".mts",
 | 
				
			||||||
                ".rec"
 | 
					                ".rec"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user