af60e8b Remove residual merge tag from spec file

Authored and Committed by jgu 12 years ago
    Remove residual merge tag from spec file
    
        
file modified
+0 -1