58162a7314
The conflict merge will happen shortly after. |
||
---|---|---|
.. | ||
bestmx_is_local.m4 | ||
local_procmail.m4 | ||
masquerade_envelope.m4 | ||
notsticky.m4 | ||
nullclient.m4 | ||
redirect.m4 | ||
smrsh.m4 | ||
stickyhost.m4 | ||
use_ct_file.m4 |
58162a7314
The conflict merge will happen shortly after. |
||
---|---|---|
.. | ||
bestmx_is_local.m4 | ||
local_procmail.m4 | ||
masquerade_envelope.m4 | ||
notsticky.m4 | ||
nullclient.m4 | ||
redirect.m4 | ||
smrsh.m4 | ||
stickyhost.m4 | ||
use_ct_file.m4 |