[kaya/f18: 6/6] Rebuilt kaya for new ghc-editline release

[Jochen Schmitt]

commit d7ffb7491487f07a0c588705a4e510157ced1556
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Thu Nov 29 09:56:37 2012 +0100

    Rebuilt kaya for new ghc-editline release

 kaya.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/kaya.spec b/kaya.spec
index 6c916ec..b69ccd5 100644
--- a/kaya.spec
+++ b/kaya.spec
@@ -25,15 +25,9 @@ Patch7:		kaya-0.5.2-ghc74-base.patch
 
 ExcludeArch:	sparc64
 
-<<<<<<< HEAD
-BuildRequires:  libtool, autoconf, pkgconfig, ghc-devel, 
-BuildRequires:	ghc >= 6.10.3, gc-devel, happy, zlib-devel, gnutls-devel
-BuildRequires:  libgcrypt-devel, pcre-devel ghc-editline-devel
-=======
 BuildRequires:  libtool, autoconf, pkgconfig
 BuildRequires:	gc-devel, happy, zlib-devel, gnutls-devel
 BuildRequires:  libgcrypt-devel, pcre-devel
->>>>>>> master
 BuildRequires:	postgresql-devel, mysql-devel, sqlite-devel
 BuildRequires:  gd-devel, SDL-devel, mesa-libGL-devel
 BuildRequires:  ncurses-devel, freeglut-devel