3f71c3b remove merge conflict non-sense

Authored and Committed by jogas 2 years ago
    remove merge conflict non-sense
    
        
file modified
+0 -5