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 | |
| 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
| -rw-r--r-- | usr.sbin/smtpd/smtpd/Makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile index 9a8b1e55..858bfeda 100644 --- a/usr.sbin/smtpd/smtpd/Makefile +++ b/usr.sbin/smtpd/smtpd/Makefile @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -# $OpenBSD: Makefile,v 1.91 2018/06/03 14:04:06 gilles Exp $ -======= -# $OpenBSD: Makefile,v 1.108 2020/09/23 18:01:27 martijn Exp $ ->>>>>>> 770825c6930... Add support for agentx to smtpd. -======= # $OpenBSD: Makefile,v 1.109 2020/09/23 19:11:50 martijn Exp $ ->>>>>>> 99399201a83... Revert agentx support for now, we're too close to release. .PATH: ${.CURDIR}/.. |