Skip to content
Commit 9aa0ded2 authored by Jakob Moser's avatar Jakob Moser
Browse files

Remove old data from merge conflict from database.txt

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