cereal: Take over as maintainer from bacon@

[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 20:56:43 2024 +1000
Changeset:	3d81d2233ac43f392ad530d7faf4e7c3ce512225

Modified Files:
	cereal/Makefile

Log Message:
cereal: Take over as maintainer from bacon@

Approved by bacon@.

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

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 insertions(+)

diffs:
diff --git a/cereal/Makefile b/cereal/Makefile
index 1bb5499023..324772aafa 100644
--- a/cereal/Makefile
+++ b/cereal/Makefile
@@ -6,7 +6,11 @@ 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