@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.3133 2010/09/05 01:23:00 tron Exp $
+$NetBSD: CHANGES-2010,v 1.3134 2010/09/05 01:23:54 tron Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -4081,9 +4081,5 @@
 	Updated www/p5-Handel to 1.00011nb3 [sno 2010-09-04]
 	Updated www/p5-SVN-Web to 0.53nb5 [sno 2010-09-04]
 	Updated devel/py-setuptools to 0.6c11nb1 [tron 2010-09-04]
-<<<<<<< CHANGES-2010
-=======
-	Updated pkgtools/rpm2pkg to 3.1.1 [tron 2010-09-05]
 	Updated textproc/p5-Search-Xapian to 1.0.21.0 [schmonz 2010-09-05]
->>>>>>> 1.3132
 	Updated pkgtools/rpm2pkg to 3.1.2 [tron 2010-09-05]