must merge before commit

must merge before commit
must merge before commit

diff --git a/lib/ftp.c b/lib/ftp.c
index 5270ab021c6d51106c1dbf24521ef902c1953fee..2537ed78964ef5e1e001b5f7ee5b875890785d01 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -600,8 +600,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
 }
 
 
-
-static CURLCode _ftp_sendquote(struct connectdata *conn, struct curl_slist *quote)
+static CURLcode _ftp_sendquote(struct connectdata *conn, struct curl_slist *quote)
 {
   struct curl_slist *item;
   ssize_t            nread;