[pkgsrc/trunk]: pkgsrc/doc Remove conflict markers. Hi tnn!

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/575aa88e04cf
branches:  trunk
changeset: 569553:575aa88e04cf
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 16 16:37:35 2010 +0000

description:
Remove conflict markers. Hi tnn!

diffstat:

 doc/CHANGES-2010 |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 914fadf62563 -r 575aa88e04cf doc/CHANGES-2010
--- a/doc/CHANGES-2010  Sat Jan 16 16:35:16 2010 +0000
+++ b/doc/CHANGES-2010  Sat Jan 16 16:37:35 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.131 2010/01/16 16:35:16 wiz Exp $
+$NetBSD: CHANGES-2010,v 1.132 2010/01/16 16:37:35 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -84,9 +84,7 @@
        Updated sysutils/cdrtools to 2.01.01alpha70 [wiz 2010-01-15]
        Updated games/rftg to 0.6.0 [wiz 2010-01-15]
        Updated security/pam_ssh_agent_auth to 0.9.2 [agc 2010-01-15]
-<<<<<<< CHANGES-2010
        Updated math/nickle to 2.69 [tnn 2010-01-15]
-=======
        Updated mail/sendmail to 8.14.4 [jnemeth 2010-01-16]
        Updated mail/libmilter to 8.14.4 [jnemeth 2010-01-16]
        Updated devel/libthai to 0.1.13 [obache 2010-01-16]