From a36abe02723d98824520a4641798b5b2ac24e3c7 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 12 Jul 2022 09:58:03 +0300
Subject: [PATCH] Fix missed git conflicts

---
 .../ui/categories/edit/FavouritesCategoryEditActivity.kt     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
index 8f64ea2ad..004acfc87 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
@@ -115,13 +115,8 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
 	}
 
 	private fun initSortSpinner() {
-<<<<<<< Updated upstream
 		val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
-		val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, entries)
-=======
-		val entries = FavouriteCategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
 		val adapter = SortAdapter(this, entries)
->>>>>>> Stashed changes
 		binding.editSort.setAdapter(adapter)
 		binding.editSort.onItemClickListener = this
 	}