d334e3 remove old conflicts

Authored and Committed by Zdenek Dohnal 3 years ago
1 file changed. 3 lines added. 4 lines removed.
    remove old conflicts
    
        
file modified
+3 -4