# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1231785008 -10800
# Node ID b2e9a7371d495a038208e92444db959bb892a193
# Parent  173bfcba4ada2b1e3227c73b4ab5a1af38d71dea
Mail: remove merge artifact.

diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -365,9 +365,6 @@ u_char *ngx_mail_log_error(ngx_log_t *lo
 
 char *ngx_mail_capabilities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 
-#if (NGX_MAIL_SSL)
-void ngx_mail_starttls_handler(ngx_event_t *rev);
-#endif
 
 /* STUB */
 void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_peer_addr_t *peer);