Skip to content
Commit 5a98f7f7 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Ignore merge noise generated by git.

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