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")