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

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

parent 7cd7e153
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