[pkgsrc/trunk]: pkgsrc/devel/tcl-tclOO Remove conflict.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7483c22340fb
branches:  trunk
changeset: 626610:7483c22340fb
user:      asau <asau%pkgsrc.org@localhost>
date:      Sat Nov 16 21:04:37 2013 +0000

description:
Remove conflict.

diffstat:

 devel/tcl-tclOO/distinfo |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (14 lines):

diff -r a3b5ae02e43a -r 7483c22340fb devel/tcl-tclOO/distinfo
--- a/devel/tcl-tclOO/distinfo  Sat Nov 16 21:02:36 2013 +0000
+++ b/devel/tcl-tclOO/distinfo  Sat Nov 16 21:04:37 2013 +0000
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2013/11/16 21:01:26 asau Exp $
+$NetBSD: distinfo,v 1.2 2013/11/16 21:04:37 asau Exp $
 
 SHA1 (TclOO1.0.1.tar.gz) = b28be85ba9c29acb650164c1cabddec7f1dae83f
 RMD160 (TclOO1.0.1.tar.gz) = 8d80a3628ca33fb26e0aa4080c0c917f5799f450
 Size (TclOO1.0.1.tar.gz) = 228647 bytes
-<<<<<<< distinfo
-SHA1 (patch-aa) = da39a3ee5e6b4b0d3255bfef95601890afd80709
-=======
->>>>>>> 1.5