Rev 439: Fix incorrect merge. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

------------------------------------------------------------
revno: 439
revision-id: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
parent: jelmer at samba.org-20070319112336-stvy6ag2g60xhxva
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-03-19 16:09:00 +0100
message:
  Fix incorrect merge.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file '__init__.py'
--- a/__init__.py	2007-03-19 11:23:36 +0000
+++ b/__init__.py	2007-03-19 15:09:00 +0000
@@ -87,7 +87,6 @@
         warning('Needs at least sqlite 3.3.x')
         raise bzrlib.errors.BzrError("incompatible sqlite library")
 
-check_bzrlib_version(required_bzr_version)
 check_bzrlib_version(compatible_bzr_versions)
 check_subversion_version()
 check_pysqlite_version()