From 90f741ad77ecdc8a5490db6ecf95cefb51e5642b Mon Sep 17 00:00:00 2001 From: Michael Kaspera Date: Tue, 4 Oct 2022 16:19:46 +0200 Subject: [PATCH] Fix: Test case --- .../resources/de/adito/git/data/merge/ImportsConflict/Expected | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTests/src/test/resources/de/adito/git/data/merge/ImportsConflict/Expected b/IntegrationTests/src/test/resources/de/adito/git/data/merge/ImportsConflict/Expected index 50e83480..0c02ff2a 100644 --- a/IntegrationTests/src/test/resources/de/adito/git/data/merge/ImportsConflict/Expected +++ b/IntegrationTests/src/test/resources/de/adito/git/data/merge/ImportsConflict/Expected @@ -1,5 +1,5 @@ import { ContextUtils, AdminViewUtils } from "Context_lib"; -import { AttributeUtil, AttributeRelationUtils, AttributeType, AttributeTypeUtil, AttributeUsageUtil, AttributeRelationQuery, AttributeRelation, AttributeTypes } from "Attribute_lib"; +import { AttributeUtil, AttributeRelationUtils, AttributeTypes, AttributeTypeUtil, AttributeUsageUtil, AttributeRelationQuery, AttributeRelation, AttributeType } from "Attribute_lib"; import { neon } from "@aditosoftware/jdito-types"; import { vars } from "@aditosoftware/jdito-types"; import { ActivityUtils, TaskUtils } from "ActivityTask_lib";