fbc16b5 fix merge conflict

Authored and Committed by pwouters 15 years ago
1 file changed. 7 lines added. 1 lines removed.
    fix merge conflict
    
        
file modified
+7 -1