From a280e43949a489192dd7a80ee9c982843d9b153e Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Wed, 26 Apr 2017 15:57:55 +0200
Subject: [PATCH] fix import error

---
 _pytest/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 7c69a96f5..6e41f0504 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['__version__']
 
 try:
-    from ._version import __version__
+    from ._version import version as __version__
 except ImportError:
     # broken installation, we don't even try
     # unknown only works because we do poor mans version compare