From c7aa3b96e63467546412604f9e20f050a37d3840 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Tue, 21 Apr 2020 13:45:02 -0600
Subject: [PATCH 1/2] merge mu template

---
 srcpkgs/mu/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 78668f59da8..5fdd3a9ad45 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz"
 checksum=66ae911abb3d7269514fada08e7a13ad61a205e10209055c41df2f9d17568274
+<<<<<<< HEAD
 
 if [ ! "$CROSS_BUILD" ]; then
 	subpackages="mu4e"
@@ -22,6 +23,8 @@ else
 	subpackages=" "
 	configure_args+=" --disable-mu4e"
 fi
+=======
+>>>>>>> 4f8783e0ec... mu: update to 1.4
 
 pre_configure() {
 	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am

From 98e85b6c8ea7c1e015a32a47992c2aea9900d0da Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Tue, 21 Apr 2020 17:40:42 -0600
Subject: [PATCH 2/2] picom: update to v8

---
 srcpkgs/picom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/picom/template b/srcpkgs/picom/template
index aefb85b1d39..884f94e20c4 100644
--- a/srcpkgs/picom/template
+++ b/srcpkgs/picom/template
@@ -1,6 +1,6 @@
 # Template file for 'picom'
 pkgname=picom
-version=7.5
+version=8
 revision=1
 build_style=meson
 configure_args="-Dbuild_docs=true"
@@ -14,7 +14,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT, MPL-2.0"
 homepage="https://github.com/yshui/picom/"
 distfiles="https://github.com/yshui/picom/archive/v${version}.tar.gz"
-checksum=1fdeda688d09643563e4314f885beaf074023235e56598ae98d481364e615607
+checksum=f839a3c058ca90f463eae3973a9381cf2fe93be7d0e58db1c28ea72acd10480f
 
 post_install() {
 	vlicense LICENSES/MIT