fix conflict

wangzhengquan

2020-07-28 b7228c8620a6a0b593f1d8b82af5aac7ba456a85

1
2
3
4
5
6
ipcrm -a
rm *.txt
./test_lostdata
sort -n c.txt  > c1.txt
sort -n p.txt  > p1.txt
diff -u p1.txt c1.txt