CVS commit: [pkgsrc-2021Q3] pkgsrc/print/ghostscript-agpl

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Tue Oct  5 21:20:57 UTC 2021

Modified Files:
        pkgsrc/print/ghostscript-agpl [pkgsrc-2021Q3]: distinfo

Log Message:
print/ghostscript-agpl: Fix broken merge for distinfo


To generate a diff of this commit:
cvs rdiff -u -r1.35.4.1 -r1.35.4.2 pkgsrc/print/ghostscript-agpl/distinfo

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

Modified files:

Index: pkgsrc/print/ghostscript-agpl/distinfo
diff -u pkgsrc/print/ghostscript-agpl/distinfo:1.35.4.1 pkgsrc/print/ghostscript-agpl/distinfo:1.35.4.2
--- pkgsrc/print/ghostscript-agpl/distinfo:1.35.4.1     Tue Oct  5 19:54:29 2021
+++ pkgsrc/print/ghostscript-agpl/distinfo      Tue Oct  5 21:20:57 2021
@@ -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