From 0630206d4565e6a46c06c2614858d11bdfb21d77 Mon Sep 17 00:00:00 2001
From: Alexis Lameire <alexisis-pristontale@hotmail.com>
Date: Apr 29 2013 17:31:34 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/adobe-source-sans-pro-fonts


Conflicts:
	adobe-source-sans-pro-fonts.spec

---

diff --git a/adobe-source-sans-pro-fonts.spec b/adobe-source-sans-pro-fonts.spec
index fabf3fa..434adcf 100644
--- a/adobe-source-sans-pro-fonts.spec
+++ b/adobe-source-sans-pro-fonts.spec
@@ -2,8 +2,13 @@
 %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
@@ -51,6 +56,9 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 * Mon Apr 29 2013 Alexis Lameire <alexisis-pristontale@hotmail.com> - 1.050-1
 - update to 1.050-1 upstream release
 
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.034-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Wed Aug 29 2012 Alexis Lameire <alexisis-pristontale@hotmail.com> - 1.034-1
 - update to 1.034-1 upstream release