Skip to content
Snippets Groups Projects
Verified Commit fcdf7302 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Resolved unnoticed merge conflict.

parent f57ee93e
Branches
Tags
2 merge requests!178FIX: #96 Better error output for crawl.py script.,!171sav/spss converter
Pipeline #51984 passed with warnings
......@@ -53,19 +53,10 @@ class Identifiable():
backrefs: list, TODO future
"""
<< << << < HEAD
def __init__(self, record_id: Optional[int] = None, path: Optional[str] = None,
record_type: Optional[str] = None,
def __init__(self, record_id: Optional[int] = None, record_type: Optional[str] = None,
name: Optional[str] = None, properties: Optional[dict] = None,
backrefs: Optional[list[Union[int, str]]] = None):
if (record_id is None and path is None and name is None
== == ===
def __init__(self, record_id: int=None, record_type: str=None,
name: str=None, properties: dict=None,
backrefs: list[Union[int, str]]=None):
if (record_id is None and name is None
>> >>>> > dev
and (backrefs is None or len(backrefs) == 0)
and (properties is None or len(properties) == 0)):
raise ValueError(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment