8cb218 Fix file conflict.

Authored and Committed by jussilehtola 10 years ago
1 file changed. 5 lines added. 2 lines removed.
    Fix file conflict.
    
        
file modified
+5 -2