fix merge conflict

51f3877e · Stefan Behnel · 81a1f7fd · 51f3877e
Commit 51f3877e authored Jan 04, 2013 by Stefan Behnel
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Cython/__init__.py Cython/__init__.py +0 -4

No files found.
--- a/Cython/__init__.py
+++ b/Cython/__init__.py
-<<<<<<< HEAD
 from Cython.Shadow import __version__
-=======
-__version__ = "0.17.4"
->>>>>>> bugs

 # Void cython.* directives (for case insensitive operating systems).
 from Cython.Shadow import *