4c78f0f add explicit conflicts for broken version

Authored and Committed by Rex Dieter 9 years ago
1 file changed. 3 lines added. 0 lines removed.
    add explicit conflicts for broken version
    
        
file modified
+3 -0