a7345d cleanup, remove old conditionals, Conflicts

Authored and Committed by rdieter 6 years ago
1 file changed. 5 lines added. 11 lines removed.
    cleanup, remove old conditionals, Conflicts
    
        
file modified
+5 -11