5c622b8 cleaned git conflict messages

Authored and Committed by germano 8 years ago
    cleaned git conflict messages
    
        
file modified
+0 -7