Skip to content
Commit 3029b7cb authored by nimrod's avatar nimrod
Browse files

- Use the fixed version of the merge-conflict pre-commit hook locally.

parent 3e63fcd5
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