Fix mismerge

[exim.git] / test / stderr / 0068

diff --git a/test/stderr/0068 b/test/stderr/0068
index 75da05f2536678451139134bc4b84708845c7e45..e8ab485181b7e69c951bdf5ac7075277573af6f4 100644 (file)
--- a/test/stderr/0068
+++ b/test/stderr/0068
@@ -6,25 +6,23 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
->>> processing "accept" (TESTSUITE/test-config 12)
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
->>> processing "accept" (TESTSUITE/test-config 12)
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
->>> processing "accept" (TESTSUITE/test-config 12)
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
->>> processing "accept" (TESTSUITE/test-config 12)
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
->>> processing "accept" (TESTSUITE/test-config 12)
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 LOG: too many recipients: message rejected: sender=<x@y> H=(test) [V4NET.10.10.10]