Update parents.py

This commit is contained in:
Hellow 2023-03-03 14:22:46 +01:00
parent a95c83b01c
commit 9eb7b66882

View File

@ -25,7 +25,7 @@ class DatabaseObject:
self.dynamic = dynamic self.dynamic = dynamic
def merge(self, other, override: bool = False): def merge(self, other, override: bool = False):
if type(other) != type(self): if isinstance(other, type(self)):
LOGGER.warning(f"can't merge \"{type(other)}\" into \"{type(self)}\"") LOGGER.warning(f"can't merge \"{type(other)}\" into \"{type(self)}\"")
return return