From f22df49886cf19f45379bb989129b6f953b34e0f Mon Sep 17 00:00:00 2001
From: Olivia Doppelt-Azeroual <odoppelt@pasteur.fr>
Date: Mon, 24 Apr 2017 11:27:17 +0200
Subject: [PATCH] conflict resolved

-- 
GitLab