Skip to content
Snippets Groups Projects
Commit f151376a authored by Björn Schießle's avatar Björn Schießle
Browse files

remove remaining line from merge conflict

parent 894d44e7
No related branches found
No related tags found
No related merge requests 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