Fix mismerge

[exim.git] / test / mail / 0100.usery

diff --git a/test/mail/0100.usery b/test/mail/0100.usery
index f79004b7a8f1204572ce295ae10a2c7cb633b23f..880f081e70830c5c32c7e7b0989e17d59412c2d8 100644 (file)
--- a/test/mail/0100.usery
+++ b/test/mail/0100.usery
@@ -4,11 +4,12 @@ Envelope-to: usery@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaY-0005vi-00
-       for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+       id 10HmaY-000000005vi-0000
+       for usery@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 From the deep abyss