summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2020-10-10 21:52:55 -0600
committerMark Wagie2020-10-10 21:52:55 -0600
commit5520698e6ee886119c36e34a2e141fcb944bd423 (patch)
treef543de457280b3161a71dbc411928d1a89685f6b
parentaa68b66409c6ca1755c243949dd0f912354a879a (diff)
downloadaur-5520698e6ee886119c36e34a2e141fcb944bd423.tar.gz
remove conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f49f640f094..40fff29c65c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,8 +16,6 @@ pkgbase = thiefmd
depends = libarchive
depends = clutter
depends = libgee
- conflicts = ultheme-vala
- conflicts = libwritegood-vala
source = git+https://github.com/kmwallio/ThiefMD.git#commit=906f8ea9e35e415104cbb7963743be23af5ded4a
source = git+https://github.com/TwiRp/ultheme-vala.git
source = git+https://github.com/ThiefMD/libwritegood-vala.git
diff --git a/PKGBUILD b/PKGBUILD
index 9d9aa2f511c5..34dabec44250 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,6 @@ license=('GPL3')
depends=('gtkspell3' 'webkit2gtk' 'discount' 'gtksourceview4' 'libxml2' 'libarchive'
'clutter' 'libgee')
makedepends=('git' 'meson' 'vala')
-conflicts=('ultheme-vala' 'libwritegood-vala')
#source=("$pkgname-$pkgver.tar.gz::https://github.com/kmwallio/ThiefMD/archive/v$pkgver-$_codename.tar.gz")
_commit=906f8ea9e35e415104cbb7963743be23af5ded4a
source=("git+https://github.com/kmwallio/ThiefMD.git#commit=$_commit"