X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fconflict.c;h=1a921cdce7f0e6b1104a6595faf9ecaf8fe191ca;hb=7736b0a60c15cc20db0ba8c3e0fe8e11d1c78c20;hp=29a12e7935e150b5be51534c402c910343f5febe;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/conflict.c b/uip/conflict.c
index 29a12e7..1a921cd 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -134,7 +134,7 @@ main (int argc, char **argv)
 #endif	/* UCI */
     maildrops ();
 
-    done (0);
+    return done (0);
 }