911dec fix up the conflicts version for fedora-release

Authored and Committed by ausil 9 years ago
1 file changed. 5 lines added. 2 lines removed.
    fix up the conflicts version for fedora-release
    
        
file modified
+5 -2