Commit c81a2465 authored by Luc Didry's avatar Luc Didry

Trying to create a merge conflict on zanata.xml

parent 4947786a
Pipeline #43788 passed with stages
in 11 minutes and 3 seconds