dc78af3 remove a conflict marker

Authored and Committed by mclasen 16 years ago
1 file changed. 0 lines added. 1 lines removed.
    remove a conflict marker
    
        
file modified
+0 -1