mirror of
				https://github.com/TeamNewPipe/NewPipe
				synced 2025-11-04 09:13:00 +00:00 
			
		
		
		
	Fixed conflicts
This commit is contained in:
		@@ -2,7 +2,7 @@ package org.schabi.newpipe.player.listeners.view
 | 
			
		||||
 | 
			
		||||
import android.util.Log
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.widget.PopupMenu
 | 
			
		||||
import androidx.appcompat.widget.PopupMenu
 | 
			
		||||
import org.schabi.newpipe.MainActivity
 | 
			
		||||
import org.schabi.newpipe.player.Player
 | 
			
		||||
import org.schabi.newpipe.player.helper.PlaybackParameterDialog
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ package org.schabi.newpipe.player.listeners.view
 | 
			
		||||
import android.annotation.SuppressLint
 | 
			
		||||
import android.util.Log
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.widget.PopupMenu
 | 
			
		||||
import androidx.appcompat.widget.PopupMenu
 | 
			
		||||
import org.schabi.newpipe.MainActivity
 | 
			
		||||
import org.schabi.newpipe.extractor.MediaFormat
 | 
			
		||||
import org.schabi.newpipe.player.Player
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user