6bc6ede remove conflicts line as it violates fedora policy

Authored and Committed by joshkayse 14 years ago
    remove conflicts line as it violates fedora policy
    
        
file modified
+4 -3