77ee6d Rmove conflict indicators

Authored and Committed by s4504kr 9 years ago
    Rmove conflict indicators
    
        
file modified
+1 -4