c32dbac Resolve overlooked conflict

Authored and Committed by Petr Muller 11 years ago
    Resolve overlooked conflict
    
        
file modified
+0 -5