fix version merge

dimitri-yatsenko · dimitri-yatsenko · commit 4c8dd3d2e662 · 2019-08-26T09:11:20.000-05:00
diff --git a/datajoint/version.py b/datajoint/version.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
 __version__ = "0.12.dev5"
-=======
-__version__ = "0.11.3"
->>>>>>> 1e0e4b2f7500779588f5a8cde93a2cfd72e9e346
