Skip to content
Snippets Groups Projects
Commit e51c5b98 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6301 OZG-6525 Fix merge conflict

parent 7ac3322d
No related branches found
No related tags found
No related merge requests found
...@@ -185,11 +185,7 @@ describe('SearchOrganisationsEinheitContainerComponent', () => { ...@@ -185,11 +185,7 @@ describe('SearchOrganisationsEinheitContainerComponent', () => {
it('should close dialog', () => { it('should close dialog', () => {
component.selectSearchResult(organisationsEinheitResource); component.selectSearchResult(organisationsEinheitResource);
<<<<<<< HEAD
expect(component.dialogRef.close).toHaveBeenCalled(); expect(component.dialogRef.close).toHaveBeenCalled();
=======
expect(dialogRefMock.close).toHaveBeenCalledWith();
>>>>>>> master
}); });
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment