From 0c9158d0fee0597ebacf423e50888bc5ea0c85e8 Mon Sep 17 00:00:00 2001
From: notfire <notfire@posteo.net>
Date: Fri, 3 Jan 2025 16:15:38 -0500
Subject: [PATCH] fix akkofe pkgbuild

---
 pkgbuilds/iceshrimp.net-akkoma-fe-qol-git/PKGBUILD | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgbuilds/iceshrimp.net-akkoma-fe-qol-git/PKGBUILD b/pkgbuilds/iceshrimp.net-akkoma-fe-qol-git/PKGBUILD
index 1615b91..80fda4b 100644
--- a/pkgbuilds/iceshrimp.net-akkoma-fe-qol-git/PKGBUILD
+++ b/pkgbuilds/iceshrimp.net-akkoma-fe-qol-git/PKGBUILD
@@ -1,9 +1,5 @@
-pkgname=iceshrimp.net-akkoma-fe-git
-<<<<<<< HEAD
-pkgver=3.10.0.fe1a3255
-=======
+pkgname=iceshrimp.net-akkoma-fe-qol-git
 pkgver=3.10.0.a9bdf9c2
->>>>>>> b8f8580 (add shrimpnet patch)
 pkgrel=1
 license=(AGPL)
 arch=(any)