Skip to content
Commit c2d3cabd authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Adding more details to the conflict log file

parent 0d4a9574
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment