Merge master and resolve merge conflicts

author Spike29 <leguen.yannick@gmail.com>

Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)

committer Spike29 <leguen.yannick@gmail.com>

Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
author Spike29 <leguen.yannick@gmail.com>
Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
committer Spike29 <leguen.yannick@gmail.com>
Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
diff --cc maps/erbium.map
Simple merge
diff --cc maps/erbium.mapinfo
Simple merge
author	Spike29 <leguen.yannick@gmail.com>
	Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
committer	Spike29 <leguen.yannick@gmail.com>
	Sun, 2 Jan 2022 12:09:41 +0000 (13:09 +0100)
		1	2
maps/erbium.map	patch \|	diff1 \|	diff2 \|	blob \| history
maps/erbium.mapinfo	patch \|	diff1 \|	diff2 \|	blob \| history