1fa985 cleanup, remove old conditional, Conflicts

Authored and Committed by rdieter 6 years ago
1 file changed. 7 lines added. 14 lines removed.
    cleanup, remove old conditional, Conflicts
    
        
file modified
+7 -14