[newlisp/f17] Remove mixed-spaces-and-tabs warning

[ndowens]

commit 506057bccc824ab7544d99986f60752815c5194a
Author: Nathan Owens <ndowens04 at gmail.com>
Date:   Tue Apr 17 17:47:47 2012 -0500

    Remove mixed-spaces-and-tabs warning

 newlisp.spec |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/newlisp.spec b/newlisp.spec
index 0d4077c..8993cc6 100644
--- a/newlisp.spec
+++ b/newlisp.spec
@@ -1,10 +1,6 @@
 Name:           newlisp
 Version:        10.4.0
-<<<<<<< HEAD
 Release:        3%{?dist}
-=======
-Release:        2%{?dist}
->>>>>>> 114f85454650d1de502e51367a30dd9034d4498d
 Summary:        Lisp-like general purpose scripting
 
 License:        GPLv3+
@@ -33,13 +29,11 @@ sed -i.m64 's/\-m64 //' makefile_linuxLP64
 %configure
 
 %ifarch x86_64
-<<<<<<< HEAD
 CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
         make -f makefile_linuxLP64 %{?_smp_mflags}
-=======
+
 CFLAGS="%{optflags} -m64 -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
 	make -f makefile_linuxLP64 %{?_smp_mflags}
->>>>>>> 114f85454650d1de502e51367a30dd9034d4498d
 %endif
 
 %ifarch %{ix86}