Fix mismerge

[exim.git] / test / mail / 5000.new / 5.myhost.test.ex

diff --git a/test/mail/5000.new/5.myhost.test.ex b/test/mail/5000.new/5.myhost.test.ex
index 054bf9048a235ebcfe8e34ade0d15b36f5819189..299a126296dbb644dd0d631c53fd878e18e7d7a7 100644 (file)
--- a/test/mail/5000.new/5.myhost.test.ex
+++ b/test/mail/5000.new/5.myhost.test.ex
@@ -1,11 +1,10 @@
 Envelope-to: userx@myhost.test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
 Envelope-to: userx@myhost.test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmbD-0005vi-00
-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-maildir:maildir_tagged_
-tag:${if eq{0}{1}{rhubarb}fail}
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+       id 10HmbD-000000005vi-0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000