From 8478324b9c41d66d2141dfef0689b91cd09e3da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 9 May 2012 12:16:54 +0200
Subject: [PATCH] fix typo

---
 scribus.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scribus.spec b/scribus.spec
index 870de56..36914f6 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,5 +1,4 @@
 Name:           scribus
-<<<<<<< HEAD
 Version:        1.4.1
 Release:        1%{?dist}