1c1930 Let's return the CONFLICTS code so that we can show the nice red dot

Authored and Committed by Pierre-Yves Chibon 10 years ago
    Let's return the CONFLICTS code so that we can show the nice red dot
    
        
file modified
+12 -4