From e51c5b98cf38d13dc1fb2f2400349ff0828dba9b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 26 Aug 2024 15:11:55 +0200
Subject: [PATCH] OZG-6301 OZG-6525 Fix merge conflict
---
.../search-organisations-einheit-container.component.spec.ts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts
index 2c1a7ecd7a..394f2ed34b 100644
--- a/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-container.component.spec.ts
@@ -185,11 +185,7 @@ describe('SearchOrganisationsEinheitContainerComponent', () => {
it('should close dialog', () => {
component.selectSearchResult(organisationsEinheitResource);
-<<<<<<< HEAD
expect(component.dialogRef.close).toHaveBeenCalled();
-=======
- expect(dialogRefMock.close).toHaveBeenCalledWith();
->>>>>>> master
});
});
--
GitLab