PROXY: fix mismerge
authorJeremy Harris <jgh146exb@wizmail.org>
Tue, 8 Dec 2015 22:40:58 +0000 (22:40 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 8 Dec 2015 22:40:58 +0000 (22:40 +0000)
commit7a2fa0bc49edcd925d51605836f0132a130e0167
tree904df36d9528bba1f9d1b655ebaa745bc59b298a
parent4058e3f6d73fe51173d12911416133284749b778
PROXY: fix mismerge
src/src/readconf.c
src/src/smtp_in.c