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/0605 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'test/confs/0605')

diff --git a/test/confs/0605 b/test/confs/0605
index 44ccb63c7..2b5185c57 100644
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -1,12 +1,6 @@
 # Exim test configuration 0605
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 
-- 
cgit v1.2.3