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

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

diff --git a/PKGBUILD b/PKGBUILD
index 6284789..9f7dbab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Maintainer: RealStickman <mrc+aur _a_ frm01 _d_ net>
+=======
+# Maintainer: exu <aur _a_ frm01 _d_ net>
+>>>>>>> cda177a (Update maintainer name and email)
 
 pkgname=streamrip
 pkgver=2.0.5