summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Kauschinger2023-03-30 00:46:04 +0200
committerManuel Kauschinger2023-03-30 00:46:04 +0200
commit4424d4102aae8d3ff411286c351751f930862aad (patch)
treec65b5518a4471b626d7ec783d269e4ad17a0b999
parentecca559fa6671a7a4c304d1fe7d1096f3080f316 (diff)
downloadaur-4424d4102aae8d3ff411286c351751f930862aad.tar.gz
remove conflicts array
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e5c463b515d..aa8493883bd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = shimmer-firefly-wallet
depends = libxss
depends = nss
provides = shimmer-firefly-wallet
- conflicts = iota-firefly-wallet
options = !strip
source = shimmer-firefly-wallet.desktop
md5sums = b86c333fd18633c8f94e86973c798eee
diff --git a/PKGBUILD b/PKGBUILD
index 4fa0320f7602..864206d041ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,6 @@ license=('Apache')
provides=(shimmer-firefly-wallet)
options=('!strip')
depends=('gnome-keyring' 'libsecret' 'gtk3' 'libxss' 'nss')
-conflicts=('iota-firefly-wallet')
source_x86_64=("https://github.com/iotaledger/firefly/releases/download/desktop-$pkgver/firefly-desktop-$pkgver.AppImage")
sha256sums_x86_64=('4474f38d9ddf526d045927ad9cba08a841d550731a8994de6ed04b603582f050')