diff options
| author | Drew DeVault | 2018-11-23 09:49:44 -0500 |
|---|---|---|
| committer | Drew DeVault | 2018-11-23 09:49:44 -0500 |
| commit | b7394a24df2f4065a3c0335881ed36b86518c28a (patch) | |
| tree | 2316541b9599661e870c79d3119eb164894b5a62 | |
| parent | a390830dbf1613153800ea3d96eed0359506e310 (diff) | |
| download | aur-b7394a24df2f4065a3c0335881ed36b86518c28a.tar.gz | |
Fix dumb merge errors
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
2 files changed, 5 insertions, 9 deletions
@@ -1,14 +1,15 @@ pkgbase = mako-git pkgdesc = Lightweight notification daemon for Wayland - pkgver = r59.4e4e960 - pkgrel = 2 + pkgver = r315.9c4fea7 + pkgrel = 1 url = http://mako-project.org arch = i686 arch = x86_64 license = MIT makedepends = meson makedepends = scdoc - makedepends = wayland-protocols git + makedepends = wayland-protocols + makedepends = git depends = pango depends = cairo depends = wayland @@ -1,13 +1,8 @@ # Maintainer: Drew DeVault <sir@cmpwn.com> pkgname=mako-git _pkgname=mako -<<<<<<< HEAD -pkgver=r268.23d9e4a +pkgver=r315.9c4fea7 pkgrel=1 -======= -pkgver=r59.4e4e960 -pkgrel=2 ->>>>>>> Add git to makedeps license=('MIT') pkgdesc='Lightweight notification daemon for Wayland' makedepends=("meson" "scdoc" "wayland-protocols" "git") |