My fingerprints: Add tag filter and title sorting, and fix trending (s…

…tashapp#911)
javstash · Jan 27, 2025 · 7215fba · 7215fba
1 parent 1cb625e
commit 7215fba
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/frontend/src/pages/users/UserFingerprintsList/UserFingerprintsList.tsx b/frontend/src/pages/users/UserFingerprintsList/UserFingerprintsList.tsx
@@ -31,7 +31,10 @@ interface Props {
 
 const sortOptions = [
   { value: SceneSortEnum.DATE, label: "Release Date" },
+<<<<<<< HEAD
   { value: SceneSortEnum.CODE, label: "Code" },
+=======
+>>>>>>> My fingerprints: Add tag filter and title sorting, and fix trending (#911)
   { value: SceneSortEnum.TITLE, label: "Title" },
   { value: SceneSortEnum.TRENDING, label: "Trending" },
   { value: SceneSortEnum.CREATED_AT, label: "Created At" },