585a152 Fix merge conflict

Authored and Committed by Mads Villadsen 12 years ago
    Fix merge conflict
    
        
file modified
+7 -4