0c5e80a Drop old conflicts

Authored and Committed by kalev 4 years ago
    Drop old conflicts
    
        
file modified
+0 -2