upgpkg: fisher-git 3.2.6.r1.gae878a8-1

Remove fisherman-git conflict, as it was merged into fisher-git

2 files changed, 1 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95d7dc564925..5200c4a454f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,6 @@ pkgbase = fisher-git
 	depends = fish>=2.3.0
 	depends = curl
 	depends = git
-	conflicts = fisherman-git
 	conflicts = fisher
 	source = git+https://github.com/jorgebucaran/fisher.git#branch=master
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 889ebe6300a3..910490b64aa8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ url="https://github.com/jorgebucaran/fisher"
 license=("MIT")
 depends=("fish>=2.3.0" "curl" "git")
 makedepends=("git")
-conflicts=("fisherman-git" "fisher")
+conflicts=("fisher")
 install=fisher-git.install
 source=(
     "git+https://github.com/jorgebucaran/fisher.git#branch=${_branch}"