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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/01347d41b13f
branches:  trunk
changeset: 650648:01347d41b13f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Apr 25 11:36:18 2015 +0000

description:
Remove conflict markers.

diffstat:

 doc/CHANGES-2015 |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 830945c38c24 -r 01347d41b13f doc/CHANGES-2015
--- a/doc/CHANGES-2015  Sat Apr 25 11:35:46 2015 +0000
+++ b/doc/CHANGES-2015  Sat Apr 25 11:36:18 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2015,v 1.1920 2015/04/25 11:35:46 wiz Exp $
+$NetBSD: CHANGES-2015,v 1.1921 2015/04/25 11:36:18 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2015:
 
@@ -2876,9 +2876,7 @@
        Updated devel/git-svn to 2.3.6 [adam 2015-04-25]
        Updated www/gitweb to 2.3.6 [adam 2015-04-25]
        Updated net/p5-Net to 3.06 [mef 2015-04-25]
-<<<<<<< CHANGES-2015
        Renamed lang/gcc to lang/gcc2 [wiz 2015-04-25]
-=======
        Added devel/py-pyobjc version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-core version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-framework-Accounts version 3.0.4 [adam 2015-04-25]
@@ -2918,5 +2916,4 @@
        Added devel/py-pyobjc-framework-SyncServices version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-framework-SystemConfiguration version 3.0.4 [adam 2015-04-25]
        Added devel/py-pyobjc-framework-WebKit version 3.0.4 [adam 2015-04-25]
->>>>>>> 1.1919
        Updated misc/calibre to 2.26.0 [wiz 2015-04-25]