Skip to content
Snippets Groups Projects
Commit e451139f authored by Andreas Klebinger's avatar Andreas Klebinger Committed by Marge Bot
Browse files

Remove an accidental git conflict marker from a comment.

parent 833e250c
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