9d9e626 remove conflict indicators

Authored and Committed by rstrode 12 years ago
    remove conflict indicators
    
        
file modified
+0 -1