From 51f3877ee1c4919f3cd570812aef884d913328bb Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Fri, 4 Jan 2013 07:29:34 +0100
Subject: [PATCH] fix merge conflict

---
 Cython/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Cython/__init__.py b/Cython/__init__.py
index 3243c8a..a2b3a9b 100644
--- 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 *
-- 
2.7.4