X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;fp=uip%2Fconflict.c;h=30ff189bf5388c2db75fc196510068f17ad2e441;hp=5710aab8cb7f45703df1bef489cc35b1e9dab10c;hb=fce8a87e8a4a443a08a98b24eef270451a63fab8;hpb=b4c29794c12099556151d93a860ee51badae2e35

diff --git a/uip/conflict.c b/uip/conflict.c
index 5710aab..30ff189 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -116,8 +116,6 @@ main(int argc, char **argv)
 		akv[akp++] = cp;
 	}
 
-	if (akp == 0)
-		akv[akp++] = AliasFile;
 	if (!homehead)
 		init_pw();
 	if (!mail)