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
zanata.xml merge=ours
......@@ -2,8 +2,8 @@
<config xmlns="">
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment