diff options
author | Gilles Chehade <gilles@poolp.org> | 2020-11-23 20:43:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-23 20:43:13 +0100 |
commit | 67061353dcdc544295c68cb6f8c28b7c2d3ccda9 (patch) | |
tree | 21f9590566e5f513ecd67d36e5dc76b53ee22b81 /openbsd-compat/openbsd-compat.h | |
parent | partially revert revision 1.423 which went a bit too far (diff) | |
parent | Fix merge artifacts in Makefile (diff) | |
download | OpenSMTPD-67061353dcdc544295c68cb6f8c28b7c2d3ccda9.tar.xz OpenSMTPD-67061353dcdc544295c68cb6f8c28b7c2d3ccda9.zip |
Merge pull request #1099 from ryanakca/remerge-makefile
Fix merge artifacts in Makefile
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
0 files changed, 0 insertions, 0 deletions