[python-espeak/el6] Merge from HEAD

[Eduardo Mayorga Téllez]

commit 38a2dd34f1ca026bb1059cb059786e1773d6d615
Author: Eduardo Mayorga <mayorga at fedoraproject.org>
Date:   Sat Mar 29 14:09:28 2014 -0600

    Merge from HEAD

 python-espeak.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/python-espeak.spec b/python-espeak.spec
index 988a0c2..289350d 100644
--- a/python-espeak.spec
+++ b/python-espeak.spec
@@ -2,10 +2,7 @@
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{!?__python2: %global __python2 %{__python}}
-<<<<<<< HEAD
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-=======
->>>>>>> 2e4cf73e373d86cf047c4a801a0032e35eb9305c
 %global with_python3 0
 %endif