grub-btrfs: shouldn't conflict with -git pkg

2 files changed, 0 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65078d51e79a..30f963d54130 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,6 @@ pkgbase = grub-btrfs
 	depends = btrfs-progs
 	depends = grub
 	optdepends = snapper: Snapper support
-	conflicts = grub-btrfs-git
 	backup = etc/grub.d/41_snapshots-btrfs_config
 	source = https://github.com/Antynea/grub-btrfs/archive/v3.5.tar.gz
 	sha256sums = 96ba59bc1cd46efe3c4e4352dabb61702a37699b2228cacdc8dccedebbfe0331
diff --git a/PKGBUILD b/PKGBUILD
index 3c15e10673d1..c81701456f7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ url='https://github.com/Antynea/grub-btrfs'
 license=('GPL3')
 depends=('btrfs-progs' 'grub')
 optdepends=('snapper: Snapper support')
-conflicts=('grub-btrfs-git')
 backup=('etc/grub.d/41_snapshots-btrfs_config')
 source=("https://github.com/Antynea/grub-btrfs/archive/v$pkgver.tar.gz")
 sha256sums=('96ba59bc1cd46efe3c4e4352dabb61702a37699b2228cacdc8dccedebbfe0331')