Skip to content
GitLab
Commit 3ca4acd2 authored by Thibault KUMMER's avatar Thibault KUMMER
Browse files

Fix. correct detection of git conflicts

parent b1d4fcd9
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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