Rev 2797: More broken merge fallout. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2797
revision-id: robertc at robertcollins.net-20071009033603-fns5h6vuo5cnlhj5
parent: robertc at robertcollins.net-20071008045432-b8li90spr7fu7hwz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2007-10-09 13:36:03 +1000
message:
  More broken merge fallout.
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
=== modified file 'bzr'
--- a/bzr	2007-10-04 22:00:07 +0000
+++ b/bzr	2007-10-09 03:36:03 +0000
@@ -94,11 +94,6 @@
 import bzrlib.commands
 import bzrlib.trace
 
-if bzrlib.version_info[:3] != (0, 92, 0):
-    sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
-            "This may indicate an installation problem.\n"
-            "bzrlib from %s is version %r\n"
-            % (bzrlib.__path__, bzrlib.version_info))
 
 if __name__ == '__main__':
     bzrlib.trace.enable_default_logging()