SRS: fix mismerge

[exim.git] / test / log / 0302

diff --git a/test/log/0302 b/test/log/0302
index 34f6f8a7c78243ec79eeab7d086b4071fa9929ac..b5ab9c35280ea1ce59be19bfab3a6a6c4593b03e 100644 (file)
--- a/test/log/0302
+++ b/test/log/0302
@@ -1,15 +1,15 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qi
+1999-03-02 09:44:33 Start queue run: pid=p1234 -qi
 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@myhost.test.ex R=r1 defer (-1): forced defer
 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <abcd@myhost.test.ex> R=r2
-1999-03-02 09:44:33 End queue run: pid=pppp -qi
+1999-03-02 09:44:33 End queue run: pid=p1234 -qi
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qi
+1999-03-02 09:44:33 Start queue run: pid=p1235 -qi
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <wxyz@myhost.test.ex> R=r2
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qi
-1999-03-02 09:44:33 Start queue run: pid=pppp -qif
-1999-03-02 09:44:33 End queue run: pid=pppp -qif
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 End queue run: pid=p1235 -qi
+1999-03-02 09:44:33 Start queue run: pid=p1236 -qif
+1999-03-02 09:44:33 End queue run: pid=p1236 -qif
+1999-03-02 09:44:33 Start queue run: pid=p1237 -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@myhost.test.ex R=r1 defer (-1): forced defer
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 End queue run: pid=p1237 -qf