0d437b7 cleaned git conflict messages

Merged and Committed by germano 8 years ago
    cleaned git conflict messages
    
        
file modified
+8 -2