fix merge conflict

diff --git a/Cython/__init__.py b/Cython/__init__.py
index 3243c8a..a2b3a9b 100644 (file)
--- a/Cython/__init__.py
+++ b/Cython/__init__.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 from Cython.Shadow import __version__
-=======
-__version__ = "0.17.4"
->>>>>>> bugs
 
 # Void cython.* directives (for case insensitive operating systems).
 from Cython.Shadow import *