cereal: Fix previous commit of edit conflict - taking over maintainer

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Mon Aug 26 21:41:28 2024 +1000
Changeset:	32cc662de90794fb2f1ece3d0fe632f0d9a8be84

Modified Files:
	cereal/Makefile

Log Message:
cereal: Fix previous commit of edit conflict - taking over maintainer

Either I'm blind, or git lied in the diff. Or both.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=32cc662de90794fb2f1ece3d0fe632f0d9a8be84

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cereal/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diffs:
diff --git a/cereal/Makefile b/cereal/Makefile
index 324772aafa..c70683ad0b 100644
--- a/cereal/Makefile
+++ b/cereal/Makefile
@@ -6,11 +6,7 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=USCiLab/}
 GITHUB_PROJECT=	cereal
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-<<<<<<< HEAD
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-=======
 MAINTAINER=	stix%stix.id.au@localhost
->>>>>>> d0c61e189e (cereal: Take over as maintainer from bacon@)
 HOMEPAGE=	https://github.com/USCiLab/cereal
 COMMENT=	C++11 library for serialization
 LICENSE=	modified-bsd