summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorDrew DeVault2018-11-22 16:42:38 -0500
committerDrew DeVault2018-11-22 16:43:25 -0500
commita390830dbf1613153800ea3d96eed0359506e310 (patch)
treef372b1287028a5af4d1977802ff9ecb6797d4e92 /PKGBUILD
parent499cf0d920ad03a765151b8243c6c24d994d0159 (diff)
downloadaur-a390830dbf1613153800ea3d96eed0359506e310.tar.gz
Add git to makedeps
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0473273ed33b..69c530d5df7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,13 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=mako-git
_pkgname=mako
+<<<<<<< HEAD
pkgver=r268.23d9e4a
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")