]> gitweb.pimeys.fr Git - bots/salesman.git/commit
remove merge conflict
authorMaxime Bombar <bombar@crans.org>
Tue, 20 Jun 2017 07:16:59 +0000 (09:16 +0200)
committerMaxime Bombar <bombar@crans.org>
Tue, 20 Jun 2017 07:16:59 +0000 (09:16 +0200)
commit5a0e906c5317dcae3df0405c0cd4cec8e123f568
tree32335576d85187d4f80ac46690e7c57d077f5da3
parentcc61e659ac3677bed6687bc346411125482f9da0
parentd4460312a8f7e35ea7a34dde8332e30695ef8e55
remove merge conflict
questions.txt