1309dd8 Fix typo in explicit conflicts.

Authored and Committed by ralph 7 years ago
    Fix typo in explicit conflicts.
    
        
file modified
+7 -2