Rev 6384: Fix broken resolution conflict in file:///home/vila/src/bzr/experimental/config-location-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config-location-options/

------------------------------------------------------------
revno: 6384
revision-id: v.ladeuil+lp at free.fr-20111221145557-748cihx6stflzyrd
parent: v.ladeuil+lp at free.fr-20111221135547-1bjp1qzt4oxomhja
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-location-options
timestamp: Wed 2011-12-21 15:55:57 +0100
message:
  Fix broken resolution conflict
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-12-21 13:55:47 +0000
+++ b/bzrlib/config.py	2011-12-21 14:55:57 +0000
@@ -2612,6 +2612,7 @@
 
 A negative value means disable the size check.
 """))
+option_registry.register(
     Option('bound',
            default=None, from_unicode=bool_from_store,
            help="""\