diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2012-10-29 16:37:39 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2012-10-29 16:37:39 +0100 |
| commit | 8977be2d0a2e533096563644c3a63850f9e9dea8 (patch) | |
| tree | 7a2559625cd0313373cb0955adce8af6b95e1d80 /smtpd/config.c | |
| parent | Merge branch 'master' into cvs (diff) | |
| download | OpenSMTPD-8977be2d0a2e533096563644c3a63850f9e9dea8.tar.xz OpenSMTPD-8977be2d0a2e533096563644c3a63850f9e9dea8.zip | |
fix cvsid fallout from cvs2git
Diffstat (limited to 'smtpd/config.c')
| -rw-r--r-- | smtpd/config.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/smtpd/config.c b/smtpd/config.c index 3b5e2aa0..c4d77c8a 100644 --- a/smtpd/config.c +++ b/smtpd/config.c @@ -1,8 +1,4 @@ -<<<<<<< HEAD -/* $OpenBSD: config.c,v 1.16 2012/08/19 14:16:57 chl Exp $ */ -======= /* $OpenBSD: config.c,v 1.17 2012/09/27 17:47:49 chl Exp $ */ ->>>>>>> master /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> |