04f29f resolve conflict

Merged and Committed by Ondřej Vašík 12 years ago
    resolve conflict
    
        
file modified
+5 -2