From ff797e00e3bb1beb623e978f1ffae781b574f9f2 Mon Sep 17 00:00:00 2001
From: exu <mrc@frm01.net>
Date: Sun, 31 Mar 2024 16:58:08 +0200
Subject: [PATCH] Update maintainer name and email

---
 PKGBUILD | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/PKGBUILD b/PKGBUILD
index b72fe2e..eb4fbb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Maintainer: RealStickman <mrc+aur@frm01.net>
+=======
+# Maintainer: exu <aur _a_ frm01 _d_ net>
+>>>>>>> 4663b23 (Update maintainer name and email)
 
 pkgname=kopia-ui-bin
 pkgdesc='A cross-platform backup-tool with encryption, deduplication, compression and cloud support.'