From: Maxime Bombar Date: Tue, 20 Jun 2017 07:16:59 +0000 (+0200) Subject: remove merge conflict X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fsalesman.git;a=commitdiff_plain;h=5a0e906c5317dcae3df0405c0cd4cec8e123f568 remove merge conflict --- 5a0e906c5317dcae3df0405c0cd4cec8e123f568