diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-10-28 21:33:24 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-10-28 21:33:24 +0100 |
| commit | c5db348c5e29e93e51389fa0079f829967c5da82 (patch) | |
| tree | 0b876cbf4e1ae8dac81c63256ee233376940e2c8 /test/stderr/0368 | |
| parent | 1e0f06b3cfeb3c2453323453555d827c81456e1e (diff) | |
| parent | cd328be98eb5bdda73316eaf95d9d6a617c7df7d (diff) | |
Merge branch 'master' into 4.next
Diffstat (limited to 'test/stderr/0368')
| -rw-r--r-- | test/stderr/0368 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/stderr/0368 b/test/stderr/0368 index cdeaf2cb7..d631948e8 100644 --- a/test/stderr/0368 +++ b/test/stderr/0368 @@ -25,4 +25,4 @@ finding IP address for ten-2.test.ex doing DNS lookup fully qualified name = ten-2.test.ex ten-2.test.ex V4NET.0.0.2 mx=-1 sort=xx ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> |