Skip to content
Snippets Groups Projects
Commit e67d6b00 authored by Michael Lee's avatar Michael Lee
Browse files

add merge conflict check

parent d3d1a37e
No related branches found
No related tags found
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