e316c71 fix version in conflicts

Authored and Committed by remi 7 years ago
    fix version in conflicts
    
        
file modified
+1 -1