acac74 Fix merge conflict

Authored and Committed by mharris 14 years ago
    Fix merge conflict
    
        
file modified
+0 -2