54a9e1a Don't try and merge local config changes on arches we aren't building

Authored and Committed by jwboyer 6 years ago
1 file changed. 6 lines added. 1 lines removed.
    Don't try and merge local config changes on arches we aren't building
    
        
file modified
+6 -1