Commit f27cf293 authored by Luc Didry's avatar Luc Didry
Browse files

Create a conflict on zanata.xml between master and dev branches

parent 0295ba36
Pipeline #42274 passed with stages
in 6 minutes and 9 seconds
......@@ -2,7 +2,9 @@
<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