Skip to content
Commit 974c60c0 authored by nimrod's avatar nimrod
Browse files

Set the git conflictstyle.

parent 3cc98d00
Hide whitespace changes
Inline Side-by-side
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