0a8ddb0 Fix update conflicts (bz 1724305)

Authored and Committed by steved 4 years ago
    Fix update conflicts (bz 1724305)
    
    Signed-off-by: Steve Dickson <steved@redhat.com>
    
        
file modified
+1 -1