Skip to content
Commit 2bdf401f authored by Tim de Jong's avatar Tim de Jong Committed by Dylan Tack
Browse files

Removed git merge info from .info

parent 4193a09b
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