8e2e08f remove obsolete conflict with beignet

Authored and Committed by senderek 5 years ago
    remove obsolete conflict with beignet
    
        
file modified
+8 -8
file modified
+1 -1