From 03d193b3d41152733456e62bc347ae75690bbec0 Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Fri, 16 Mar 2018 19:21:32 +0000
Subject: [PATCH] Fixing merge conflicts

Former-commit-id: c8871e399e21b93959f8da17be9409f978ece18d
-- 
GitLab