96a0f6 Update conflicts with docker-selinux

Authored and Committed by Lukas Vrabec 8 years ago
    Update conflicts with docker-selinux
    
        
file modified
+1 -1