From 8dbbb063a567a9e1a36a02a2a99c60784daefab8 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Jul 20 2012 17:01:38 +0000
Subject: Fix merge of conflicts properly# Please enter the commit message for your changes. Lines starting


---

diff --git a/tulrich-tuffy-fonts.spec b/tulrich-tuffy-fonts.spec
index e7f0902..7389dbb 100644
--- a/tulrich-tuffy-fonts.spec
+++ b/tulrich-tuffy-fonts.spec
@@ -4,8 +4,6 @@
 Name:           %{fontname}-fonts
 Version:        1.28
 Release:        1%{?dist}
-Version:        1.27
-Release:        2%{?dist}
 Summary:        Generic sans font
 
 Group:          User Interface/X