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/queue_ram.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/queue_ram.c')
| -rw-r--r-- | smtpd/queue_ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/smtpd/queue_ram.c b/smtpd/queue_ram.c index 764831cf..12fc179b 100644 --- a/smtpd/queue_ram.c +++ b/smtpd/queue_ram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_ram.c,v 1.2 2013/01/31 18:34:43 eric Exp $ */ +/* $OpenBSD: queue_ram.c,v 1.3 2013/05/24 17:03:14 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> |