From 0117d593bbba3f80a622adc64c12183480da29f1 Mon Sep 17 00:00:00 2001
From: newtonick <nick@klockenga.net>
Date: Fri, 6 Aug 2021 16:33:49 -0400
Subject: [PATCH] fix merge conflict

---
 src/seedsigner/models/settings.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/seedsigner/models/settings.py b/src/seedsigner/models/settings.py
index e22379d2..8a39c2cc 100644
--- a/src/seedsigner/models/settings.py
+++ b/src/seedsigner/models/settings.py
@@ -44,7 +44,6 @@ class Settings(Singleton):
 
         settings.init_complete = True
 
-<<<<<<< Updated upstream
     def __config_to_data(self, config):
         self.persistent = config.getboolean("system", "persistent_settings")
         self._data["system"]["debug"] = config.getboolean("system", "debug")
@@ -57,8 +56,6 @@ class Settings(Singleton):
         self.custom_derivation_enabled = config.getboolean("wallet", "custom_derivation_enabled")
         self.custom_derivation = config["wallet"]["custom_derivation"]
 
-=======
->>>>>>> Stashed changes
     ### persistent settings handling
 
     @property