2018-07-20 - tools.heritage
17:16	<Lokal_Profil>	Manually resolving conflicts and creating a local commit. Resolving the difference to master is tracked at https://phabricator.wikimedia.org/T200101	[tools.heritage]