Skip to content
Snippets Groups Projects
Commit 0ef16c98 authored by Sulverus's avatar Sulverus
Browse files

gh-949 conflict fix

parent b846a8d0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
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