From 67651354d5880240259872a47774b96ebe152904 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Wed, 16 Mar 2022 15:58:46 +0100
Subject: [PATCH] Fixed conflicts

---
 .../newpipe/player/listeners/view/PlaybackSpeedClickListener.kt | 2 +-
 .../newpipe/player/listeners/view/QualityClickListener.kt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt b/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt
index fe4984c7c..52eff5a1c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt
@@ -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
diff --git a/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt b/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt
index 432fc79ae..b103ac0e6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt
@@ -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