Skip to content
Commit 0840e18d authored by Phyks (Lucas Verney)'s avatar Phyks (Lucas Verney) Committed by hydrargyrum
Browse files

Update contributing.md with merge rules

parent d8143f4e
Show 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