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/0294 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'test/confs/0294')

diff --git a/test/confs/0294 b/test/confs/0294
index 6b8a6112e..6e17b832d 100644
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -1,14 +1,9 @@
 # Exim test configuration 0294
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-- 
cgit v1.2.3