2018-07-31 - tools.heritage
09:08	<Lokal_Profil>	Manually resolving conflicts and creating a local commit due to T200101	[tools.heritage]