itojun 6bbde2ae91 resolve conflicts. (mainly due to $Id$ mistake in past import)

2000-06-13 17:18:26 +00:00

..

cf.m4

for gnu/dist/sendmail, prevent rewrite of $Id$, $Revision$ and $Date$.

2000-05-03 10:49:07 +00:00

cfhead.m4

for gnu/dist/sendmail, prevent rewrite of $Id$, $Revision$ and $Date$.

2000-05-03 10:49:07 +00:00

proto.m4

for gnu/dist/sendmail, prevent rewrite of $Id$, $Revision$ and $Date$.

2000-05-03 10:49:07 +00:00

version.m4

resolve conflicts. (mainly due to $Id$ mistake in past import)

2000-06-13 17:18:26 +00:00