Fix merge conflicts

This commit is contained in:
Lipu Fei 2019-06-18 09:45:06 +02:00
commit d1e7648f0e

View file

@ -12,6 +12,7 @@ _renamed_settings = {
} #type: Dict[str, str]
_removed_settings = ["prime_tower_circular"] # type: List[str]
## Upgrades configurations from the state they were in at version 4.1 to the
# state they should be in at version 4.2.
class VersionUpgrade41to42(VersionUpgrade):