b6839bf Fix conflicts in spec file.

Merged and Committed by hobbes1069 5 years ago
    Fix conflicts in spec file.
    
        
file modified
+3 -2