2021-01-05 - cloudinfra
12:21	<arturo>	resolve git merge conflicts and rebase cloudinfra-internal-puppetmaster-02 /var/lib/git/labs/private	[cloudinfra]