Rev 3225: Fix conflict resolution error. in file:///v/home/vila/src/bzr/experimental/selftest/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/selftest/

------------------------------------------------------------
revno: 3225
revision-id: v.ladeuil+lp at free.fr-20080324141010-c09hfv4swd4bo4ky
parent: v.ladeuil+lp at free.fr-20080323224319-3bn6nr4uezrb5d89
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest
timestamp: Mon 2008-03-24 15:10:10 +0100
message:
  Fix conflict resolution error.
  
  * bzrlib/tests/__init__.py:
  (test_suite): Fix merging error.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-21 19:00:32 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-24 14:10:10 +0000
@@ -2783,6 +2783,7 @@
     suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
 
     modules_to_doctest = [
+        'bzrlib',
         'bzrlib.errors',
         'bzrlib.export',
         'bzrlib.inventory',