Removed some merge artefact.

Trundle · Trundle · commit cae3d4923bb9 · 2011-08-28T19:09:13.000+02:00
diff --git a/bpython/__init__.py b/bpython/__init__.py
@@ -23,7 +23,6 @@
 import os.path
 
 __version__ = 'mercurial'
->>>>>>> other
 package_dir = os.path.abspath(os.path.dirname(__file__))
 
 
