Fix post-rebase merge issues.

[users/jgh/exim.git] / test / log / 0455

diff --git a/test/log/0455 b/test/log/0455
index 3e7fd8b7cb6316bc9b85d5c3c050141967372667..caeab737b0e8f08a22adb79ee3fce12c9ecfbb47 100644 (file)
--- a/test/log/0455
+++ b/test/log/0455
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@mxt97.test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss