Fix mismerge

[exim.git] / test / scripts / 0000-Basic / 0301

diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 45a8242850d61b07cb1559fabcb1b60f6b51d9a0..d7a57c330c18f5964c9ce894706417d4134c798f 100644 (file)
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -11,6 +11,7 @@ ehlo abcd\r\nmail from:<userx@test.ex>
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 ??? 250
 quit
 ??? 250
 ??? 250
 quit


@@ -23,6 +24,7 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250


@@ -47,6 +49,7 @@ ehlo en.force
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 .
 ??? 250
 mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 .