Skip to content
Snippets Groups Projects
Commit 1f78b050 authored by Ernesto Rico Schmidt's avatar Ernesto Rico Schmidt
Browse files

Fix resolve_conflicts to avoid rutime warnings

parent 83fd0408
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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