[pkgsrc/pkgsrc-2021Q3]: pkgsrc/print/ghostscript-agpl print/ghostscript-agpl:...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f860e754b97
branches:  pkgsrc-2021Q3
changeset: 459389:8f860e754b97
user:      tm <tm%pkgsrc.org@localhost>
date:      Tue Oct 05 21:20:57 2021 +0000

description:
print/ghostscript-agpl: Fix broken merge for distinfo

diffstat:

 print/ghostscript-agpl/distinfo |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (19 lines):

diff -r b33a389eb478 -r 8f860e754b97 print/ghostscript-agpl/distinfo
--- a/print/ghostscript-agpl/distinfo   Tue Oct 05 19:55:06 2021 +0000
+++ b/print/ghostscript-agpl/distinfo   Tue Oct 05 21:20:57 2021 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.35.4.1 2021/10/05 19:54:29 tm Exp $
+$NetBSD: distinfo,v 1.35.4.2 2021/10/05 21:20:57 tm Exp $
 
 SHA1 (ghostscript-9.54.0.tar.xz) = 23cce513d4e80504da0778e4ce6f05db73ae2bee
 RMD160 (ghostscript-9.54.0.tar.xz) = 2229023643022c1e6a22db4cce3f5004abb245cd
 SHA512 (ghostscript-9.54.0.tar.xz) = a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
 Size (ghostscript-9.54.0.tar.xz) = 56001768 bytes
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
-<<<<<<< distinfo
-=======
 SHA1 (patch-base_gsicc__lcms2.c) = 23f5f905b537c0d82d37e140ed45e352ab951d54
->>>>>>> 1.37
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
 SHA1 (patch-base_ttobjs.h) = 378ad7d316a4a9dc53b9c8e612582a7c8e9b3688