bc7894 remove conflict marker

Authored and Committed by Matthias Clasen 13 years ago
1 file changed. 0 lines added. 1 lines removed.
    remove conflict marker
    
        
file modified
+0 -1