Fix mismerge

[exim.git] / test / stderr / 0068

diff --git a/test/stderr/0068 b/test/stderr/0068
index 45520fa0294f43f3d36ac023de90191a87848282..e8ab485181b7e69c951bdf5ac7075277573af6f4 100644 (file)
--- a/test/stderr/0068
+++ b/test/stderr/0068
@@ -10,19 +10,19 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>>  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
 >>> 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
 >>> 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
 >>> 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
 >>> 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]
 >>> 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]