[pkgsrc/trunk]: pkgsrc/doc doc: Updated graphics/ImageMagick to 7.0.11.10

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2681c3e54612
branches:  trunk
changeset: 451714:2681c3e54612
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Fri Apr 30 12:39:52 2021 +0000

description:
doc: Updated graphics/ImageMagick to 7.0.11.10

diffstat:

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

diffs (20 lines):

diff -r 9f1fe6c138f5 -r 2681c3e54612 doc/CHANGES-2021
--- a/doc/CHANGES-2021  Fri Apr 30 12:36:03 2021 +0000
+++ b/doc/CHANGES-2021  Fri Apr 30 12:39:52 2021 +0000
@@ -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 @@
        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 textproc/paperoni to 0.4.0 [pin 2021-04-30]
        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]