[pkgsrc/trunk]: pkgsrc/doc Undo conflict markers.

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/707ea5dc437d
branches:  trunk
changeset: 445038:707ea5dc437d
user:      maya <maya%pkgsrc.org@localhost>
date:      Sat Jan 16 08:27:02 2021 +0000

description:
Undo conflict markers.

diffstat:

 doc/CHANGES-2021 |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (22 lines):

diff -r 7a9799e208b5 -r 707ea5dc437d doc/CHANGES-2021
--- a/doc/CHANGES-2021  Sat Jan 16 08:25:16 2021 +0000
+++ b/doc/CHANGES-2021  Sat Jan 16 08:27:02 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.416 2021/01/16 08:25:16 maya Exp $
+$NetBSD: CHANGES-2021,v 1.417 2021/01/16 08:27:02 maya Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -511,12 +511,8 @@
        Updated graphics/erlang-eimp to 1.0.18 [triaxx 2021-01-16]
        Updated devel/rebar3 to 3.14.3 [triaxx 2021-01-16]
        Updated graphics/dia to 0.97.3nb21 [gutteridge 2021-01-16]
-<<<<<<< CHANGES-2021
-       Updated devel/bugzilla to 5.0.6 [maya 2021-01-16]
-=======
        Updated sysutils/py-psutil to 5.8.0 [adam 2021-01-16]
        Updated security/py-authlib to 0.15.3 [adam 2021-01-16]
        Updated lang/npm to 6.14.11 [adam 2021-01-16]
        Updated archivers/py-lz4 to 3.1.2 [adam 2021-01-16]
->>>>>>> 1.415
        Updated devel/bugzilla to 5.0.6 [maya 2021-01-16]