summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Doppler2016-07-15 09:22:27 +0200
committerSimon Doppler2016-07-15 09:22:27 +0200
commitde37699f987088232d9aae5fe4320fa4a5b25aa7 (patch)
tree94f4e85943d88754f66540baba24f03f6b90ece9
parentbb82561850a8c09e4d0b329c7c85423ff6f3a5b2 (diff)
downloadaur-de37699f987088232d9aae5fe4320fa4a5b25aa7.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05c266ecd428..77a66f43f9c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Thu Jul 14 10:52:06 UTC 2016
+# Fri Jul 15 07:21:43 UTC 2016
pkgbase = mdl-git
- pkgdesc = MarkDown Less is a Markdown displayer
+ pkgdesc = MarkDown Less is a Markdown displayer (Git version)
pkgver = r123.16f55e6
pkgrel = 1
epoch = 1
@@ -11,7 +11,7 @@ pkgbase = mdl-git
license = MIT
depends = boost-libs
provides = mdl
- conflicts = MDL
+ conflicts = mdl
source = git://github.com/dopsi/mdl
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9c97ef7ea2e5..ca495b0b4e4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86' 'x86_64')
url='http://github.com/dopsi/mdl'
license=('MIT')
provides=('mdl')
-conflicts=('MDL')
+conflicts=('mdl')
depends=('boost-libs')
source=('git://github.com/dopsi/mdl')
sha1sums=('SKIP')