f30bc83 Remove forgotten merge conflicts

Authored and Committed by kubo 9 years ago
    Remove forgotten merge conflicts
    
        
file modified
+0 -7