63ee4c Fixed conflict

Merged and Committed by arrfab 4 years ago
    Fixed conflict
    
    Signed-off-by: Fabian Arrotin <arrfab@centos.org>
    
        
file modified
+1 -2