Commit 4896f414 authored by Remi  PLANEL's avatar Remi PLANEL

keep the project.xml during merge

parent ec713a4c
project.xml merge=ours
\ No newline at end of file
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