[pkgsrc/trunk]: pkgsrc/audio/csound4 Removed CVS conflict lines. Please use p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/962ea0963447
branches:  trunk
changeset: 502859:962ea0963447
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Nov 09 23:53:28 2005 +0000

description:
Removed CVS conflict lines. Please use pkglint before committing changes.

diffstat:

 audio/csound4/distinfo |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (16 lines):

diff -r 59a3df6332d2 -r 962ea0963447 audio/csound4/distinfo
--- a/audio/csound4/distinfo    Wed Nov 09 23:04:41 2005 +0000
+++ b/audio/csound4/distinfo    Wed Nov 09 23:53:28 2005 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/11/09 06:35:25 ben Exp $
+$NetBSD: distinfo,v 1.7 2005/11/09 23:53:28 rillig Exp $
 
 SHA1 (csound/csound-4.23f13gbs.0.tar.gz) = 2f86efb6e53f43cd16a6cfb0ff9a0786982f7af9
 RMD160 (csound/csound-4.23f13gbs.0.tar.gz) = 46e161975afbf68f5591842e2921ea1822df30b2
 Size (csound/csound-4.23f13gbs.0.tar.gz) = 1676345 bytes
-<<<<<<< distinfo
-=======
->>>>>>> 1.5
 SHA1 (patch-aa) = ec2b962f512bbb93aa6255dff0efa4d93aa035a8
 SHA1 (patch-ab) = 49e1780581c8aecd4962e7f05d573671576cfe42
 SHA1 (patch-ac) = ceafc26767ac533368875994a668b8118426d675