From: Bdale Garbee Date: Mon, 1 Nov 2010 23:54:26 +0000 (-0600) Subject: fix for syntax error induced when resolving merge conflicts X-Git-Tag: debian/1.24-1 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=refs%2Ftags%2Fdebian%2F1.24-1;p=debian%2Ftar fix for syntax error induced when resolving merge conflicts --- diff --git a/rmt/rmt.c b/rmt/rmt.c index bdcaff26..fff83b87 100644 --- a/rmt/rmt.c +++ b/rmt/rmt.c @@ -274,6 +274,7 @@ decode_open_flag (const char *mstr, int *pmode) rmt_error_message (EINVAL, "invalid open mode"); return 1; } + } } else mode = numeric_mode;