671846 cleaned git conflict messages

Authored and Committed by germano 4 years ago
    cleaned git conflict messages
    
        
file modified
+2 -6