[scribus/f16] fix typo

[Dan Horák]

commit 8478324b9c41d66d2141dfef0689b91cd09e3da0
Author: Dan Horák <dan at danny.cz>
Date:   Wed May 9 12:16:54 2012 +0200

    fix typo

 scribus.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
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}