Sun, 12 Dec 2021 11:18:42 +0100 wenzelm merged, resolving conflict in src/Doc/Implementation/Logic.thy;
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip