Fix merge conflicts

2025-08-10 07:09:02 +08:00 · 2019-06-18 09:45:06 +02:00 · 2019-06-18 09:45:06 +02:00 · d1e7648f0e
commit d1e7648f0e
parent 927135e0da 9236f21d67
1 changed files with 1 additions and 0 deletions
--- a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py
+++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py
@ -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):