f6178c9 Remove ancient conflicts

Authored and Committed by kalev 5 years ago
    Remove ancient conflicts
    
        
file modified
+1 -10