Merge main

Informatievlaanderen · Dec 4, 2024 · faa2fdb · faa2fdb
1 parent 1763a95
commit faa2fdb
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/packages/oslo-converter-uml-ea/lib/converter-handlers/AttributeConverterHandler.ts b/packages/oslo-converter-uml-ea/lib/converter-handlers/AttributeConverterHandler.ts
@@ -310,17 +310,10 @@ export class AttributeConverterHandler extends ConverterHandler<EaAttribute> {
       }
     }
 
-<<<<<<< HEAD
-    if (!rangeURI) {
-      throw new Error(
-        `[AttributeConverterHandler]: Unable to get the URI for the range of attribute (${object.path}).`,
-      );
-=======
     // https://vlaamseoverheid.atlassian.net/browse/SDTT-344
     // Needed a way to log errors without throwing them so that the conversion process can continue
     if (this.handleRangeError(object, rangeURI)) {
       return [];
->>>>>>> main
     }
 
     quads.push(