CVS commit: pkgsrc/doc

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Apr 30 12:39:52 UTC 2021

Modified Files:
        pkgsrc/doc: CHANGES-2021

Log Message:
doc: Updated graphics/ImageMagick to 7.0.11.10


To generate a diff of this commit:
cvs rdiff -u -r1.2517 -r1.2518 pkgsrc/doc/CHANGES-2021

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2021
diff -u pkgsrc/doc/CHANGES-2021:1.2517 pkgsrc/doc/CHANGES-2021:1.2518
--- pkgsrc/doc/CHANGES-2021:1.2517      Fri Apr 30 12:36:03 2021
+++ pkgsrc/doc/CHANGES-2021     Fri Apr 30 12:39:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.2517 2021/04/30 12:36:03 triaxx Exp $
+$NetBSD: CHANGES-2021,v 1.2518 2021/04/30 12:39:52 triaxx Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -3978,9 +3978,6 @@ Changes to the packages collection and i
        Updated net/py-grpcio-testing to 1.37.1 [adam 2021-04-30]
        Updated net/py-grpcio-tools to 1.37.1 [adam 2021-04-30]
        Updated math/fftw to 3.3.9nb5 [thor 2021-04-30]
-<<<<<<< CHANGES-2021
-       Updated graphics/ImageMagick to 7.0.11.10 [triaxx 2021-04-30]
-=======
        Updated textproc/paperoni to 0.4.0 [pin 2021-04-30]
->>>>>>> 1.2516
+       Updated graphics/ImageMagick to 7.0.11.10 [triaxx 2021-04-30]
        Updated graphics/ImageMagick to 7.0.11.10 [triaxx 2021-04-30]