a23ec2d Remove unresolved merge conflict

Authored and Committed by Lubomír Sedlář 7 years ago
    Remove unresolved merge conflict
    
        
file modified
+0 -5