Permalink
Browse files

fix merge conflict

  • Loading branch information...
1 parent 81a1f7f commit 51f3877ee1c4919f3cd570812aef884d913328bb @scoder scoder committed Jan 4, 2013
Showing with 0 additions and 4 deletions.
  1. +0 −4 Cython/__init__.py
View
@@ -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 *

0 comments on commit 51f3877

Please sign in to comment.