5ca04d2 Fix merge conflict

Authored and Committed by stefw 8 years ago
1 file changed. 0 lines added. 5 lines removed.
    Fix merge conflict
    
        
file modified
+0 -5