Tue, 25 Feb 2020 14:49:41 +0100 Resolve merge conflict
krzysztof [Tue, 25 Feb 2020 14:49:41 +0100] rev 6311
Resolve merge conflict
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 tip