pkgsrc: remove conflicts.

[Repository Conversion <srcmastr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f240c1daa4e1
branches:  trunk
changeset: 306418:f240c1daa4e1
user:      christos <christos%pkgsrc.org@localhost>
date:      Mon Apr 16 21:28:29 2018 +0000
description:
remove conflicts.

diffstat:

 mail/imap-uw/distinfo |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (17 lines):

diff -r 2290ed3349eb -r f240c1daa4e1 mail/imap-uw/distinfo
--- a/mail/imap-uw/distinfo     Mon Apr 16 21:28:04 2018 +0000
+++ b/mail/imap-uw/distinfo     Mon Apr 16 21:28:29 2018 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.47 2018/04/16 21:27:56 christos Exp $
+$NetBSD: distinfo,v 1.48 2018/04/16 21:28:29 christos Exp $
 
 SHA1 (imap-2007f.tar.Z) = 1c9935e5a261baec85dadcbc0c514b66fa3ce0a5
 RMD160 (imap-2007f.tar.Z) = 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1
 SHA512 (imap-2007f.tar.Z) = 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 Size (imap-2007f.tar.Z) = 2793529 bytes
-<<<<<<< distinfo
-=======
->>>>>>> 1.46
 SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510
 SHA1 (patch-ab) = c7985a2db4d4b5c8d2644492b2e48f8ebe2d64b1
 SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3