X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;h=0d9c78c4a1ca1c7497cdb7b183adaff7f0dde5dd;hp=4251ab2d689a5900eb6c49c6bdcefbe060d50e25;hb=ffe93d6dc707aaf92529cefb38a1814956b48c9e;hpb=1c6fe69a6025e8249c7ed30af0c2ebe9ff9da4c3

diff --git a/uip/conflict.c b/uip/conflict.c
index 4251ab2..0d9c78c 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <h/mts.h>
 #include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
@@ -74,7 +73,6 @@ main(int argc, char **argv)
 	if (context_foil(NULL) == -1)
 		done(1);
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
@@ -283,10 +281,7 @@ maildrops(void)
 {
 	register int i;
 
-	if (mmdfldir && *mmdfldir)
-		mdrop(mmdfldir);
-	if (uucpldir && *uucpldir)
-		mdrop(uucpldir);
+	mdrop(mailspool);
 	for (i = 0; dirs[i]; i++)
 		mdrop(dirs[i]);
 }