X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;h=8247ff0cf32912e97cdc6ce78849d8e77ecd18bd;hp=1713b15b1899e5b01827cda24465bd4ef7b32be3;hb=38615191e71744b066425e0c44412b62dbe49cc2;hpb=045101c0a79f43fe566422622f154d5cc0141d8a

diff --git a/uip/conflict.c b/uip/conflict.c
index 1713b15..8247ff0 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -139,7 +139,8 @@ main (int argc, char **argv)
 #endif	/* UCI */
     maildrops ();
 
-    return done (0);
+    done (0);
+    return 1;
 }