Commit 4fe4ccd2 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Removed .orig residues from merge conflicts

parent 2acae739
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment