diff options
| author |   Charles Longeau <github@chl.be> | 2013-05-28 12:53:17 +0200 |
|---|---|---|
| committer | Charles Longeau <github@chl.be> | 2013-05-28 12:53:17 +0200 |
| commit | 01ac9d9dc33888bc7c21a6d7fd423424611536ab (patch) | |
| tree | 5d76e89ab323eede88d68e363aa4f0f739c6e63b /smtpd/iobuf.c | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | Merge branch 'master' of ssh://ssh.poolp.org/git/opensmtpd (diff) | |
| download | OpenSMTPD-01ac9d9dc33888bc7c21a6d7fd423424611536ab.tar.xz OpenSMTPD-01ac9d9dc33888bc7c21a6d7fd423424611536ab.zip | |
fix merge master conflicts
Diffstat (limited to 'smtpd/iobuf.c')
| -rw-r--r-- | smtpd/iobuf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/smtpd/iobuf.c b/smtpd/iobuf.c index 9fe269b4..a84d4de5 100644 --- a/smtpd/iobuf.c +++ b/smtpd/iobuf.c @@ -1,4 +1,5 @@ -/* $OpenBSD: iobuf.c,v 1.4 2013/01/26 09:37:23 gilles Exp $ */ +/* $OpenBSD: iobuf.c,v 1.5 2013/05/24 17:03:14 eric Exp $ */ + /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * |