30cca69 Fix bad merge

Authored and Committed by sgallagh 5 years ago
    Fix bad merge
    
    Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>