Fix issues after merge conflicts

This commit is contained in:
amcmanu3 2022-12-19 17:15:26 -05:00
parent 3ab57f116c
commit fbc506f2fd

View File

@ -376,7 +376,6 @@ class Helpers:
return default_return
def set_settings(self, data):
try:
with open(self.settings_file, "w", encoding="utf-8") as f:
@ -420,7 +419,6 @@ class Helpers:
return False
return True
>>>>>>> app/classes/shared/helpers.py
def set_setting(self, key, new_value):
try:
with open(self.settings_file, "r", encoding="utf-8") as f: