a21fe28 Remove leftover from merge

Authored and Committed by Fabian Affolter 5 years ago
    Remove leftover from merge
    
        
file modified
+1 -8