commit cfd74b654d25f8689869706eb2382ee2ecac5d0c Author: Alexis Lameire alexisis-pristontale@hotmail.com Date: Mon Apr 29 19:32:41 2013 +0200

solve unsolved merge conflict

adobe-source-sans-pro-fonts.spec | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) --- diff --git a/adobe-source-sans-pro-fonts.spec b/adobe-source-sans-pro-fonts.spec index 434adcf..6a3af73 100644 --- a/adobe-source-sans-pro-fonts.spec +++ b/adobe-source-sans-pro-fonts.spec @@ -2,13 +2,8 @@ %global fontconf 63-%{fontname}.conf

Name: adobe-source-sans-pro-fonts -<<<<<<< HEAD Version: 1.050 Release: 1%{?dist} -======= -Version: 1.034 -Release: 2%{?dist} ->>>>>>> c3593daf230c18c041fb03b3cd928d69d732940e Summary: A set of OpenType fonts designed for user interfaces

License: OFL