add conflicts

2 files changed, 4 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a825206c99e5..23bc5304e40c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Dec 24 09:29:15 UTC 2015
+# Thu Dec 24 10:05:41 UTC 2015
 pkgbase = execline
 	pkgdesc = A (non-interactive) scripting language, like sh
 	pkgver = 2.1.4.5
@@ -9,6 +9,7 @@ pkgbase = execline
 	arch = x86_64
 	license = ISC
 	depends = skalibs
+	conflicts = imagemagick
 	source = http://skarnet.org/software/execline/execline-2.1.4.5.tar.gz
 	sha256sums = ab4451d4992a5d7fb2ae34cffe4d0806e4902bf9aa27ee3b75617aa35379356f
 
diff --git a/PKGBUILD b/PKGBUILD
index 03d1880f2606..507c69164b3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,8 @@ arch=('i686' 'x86_64')
 url="http://skarnet.org/software/${pkgname}/"
 license=('ISC')
 depends=('skalibs')
+#/usr/bin/import conflicts
+conflicts=('imagemagick')
 source=("http://skarnet.org/software/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('ab4451d4992a5d7fb2ae34cffe4d0806e4902bf9aa27ee3b75617aa35379356f')