[gnustep-base/f19] Resolve forgotten merge conflict

[Jochen Schmitt]

commit 23204ad3655c852b16dd7350348f001eab08b5c3
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun May 5 19:45:54 2013 +0200

    Resolve forgotten merge conflict

 gnustep-base.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/gnustep-base.spec b/gnustep-base.spec
index 6264073..1d337a6 100644
--- a/gnustep-base.spec
+++ b/gnustep-base.spec
@@ -80,11 +80,7 @@ mv ChangeLog.2.utf8 ChangeLog.2
 ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//')
 %gnustep_configure --disable-ffcall --with-ffi-include=$ffi_include
 
-<<<<<<< HEAD
-make # %{?_smp_mflags}
-=======
 %gnustep_make -n
->>>>>>> master
 
 %install
 %gnustep_install -n