0ae3c5 Let's not email the admins when there is a conflict in a PR

Authored and Committed by Pierre-Yves Chibon 8 years ago
    Let's not email the admins when there is a conflict in a PR
    
        
file modified
+0 -2