a7c4cfb get rid of broken conflicts

Authored and Committed by spot 16 years ago
1 file changed. 4 lines added. 2 lines removed.
    get rid of broken conflicts
    
        
file modified
+4 -2