a15eaa5 HBSD: Resolve merge conflict — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflict

Shawn Webb committed 2 years ago

commit a15eaa5fe91264dbf6c610c2ade44d0270869966
parent 9856def

1 file changed +0 -4

modified libpkg/pkg_repo_create.c

@@ -1,9 +1,5 @@

 /*-
 <<<<<<< HEAD
  * Copyright (c) 2011-2019 Baptiste Daroussin <bapt@FreeBSD.org>
 =======
  * Copyright (c) 2011-2023 Baptiste Daroussin <bapt@FreeBSD.org>
 >>>>>>> upstream/master
  * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org>
  * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
  * Copyright (c) 2012-2013 Matthew Seaman <matthew@FreeBSD.org>