Fix mismerge

[exim.git] / test / mail / 0023.cond-

diff --git a/test/mail/0023.cond- b/test/mail/0023.cond-
index 84b3bd601955dec7e79c921d7d4d22556dcb0560..ae44bdca545ea5fa8160747bbb77de16250a5e02 100644 (file)
--- a/test/mail/0023.cond-
+++ b/test/mail/0023.cond-
@@ -1,9 +1,10 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)

-       id 10HmbF-0005vi-00
-       for cond-@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbF-000000005vi-0000
+       for cond-@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-message-body-size: 0
 
 
 X-message-body-size: 0