From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 25 Nov 2016 11:23:26 +0100
Subject: Merge from master into 4.next

Done with git merge --squash -x theirs master
---
 test/confs/5820 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'test/confs/5820')

diff --git a/test/confs/5820 b/test/confs/5820
index 1b487026f..6c2f26ce0 100644
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-- 
cgit v1.2.3