a1df674 Properly resolve conflict

Authored and Committed by dodji 14 years ago
1 file changed. 0 lines added. 5 lines removed.
    Properly resolve conflict
    
        
file modified
+0 -5