From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" 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/stderr/0442 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/stderr/0442') diff --git a/test/stderr/0442 b/test/stderr/0442 index 6db126e5a..85904224e 100644 --- a/test/stderr/0442 +++ b/test/stderr/0442 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 38 of TESTSUITE/test-config: failed to open included configuration file /non/existent -- cgit v1.2.3