bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-06 18:43:36 +00:00
Code Issues Releases Wiki Activity

Fix improper merge conflict resolution

Browse Source
This commit is contained in:
Shane Melton
2023-08-30 15:09:42 -07:00
parent 5dc3ca85c3
commit e8053e2d3a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Core.Test/Vault/AutoFixture/CollectionFixture.cs
View File

@@ -17,7 +17,7 @@ public class CollectionCustomization : ICustomization
{
var orgId = Guid.NewGuid();
fixture.Customize<CurrentContentOrganization>(composer => composer
fixture.Customize<CurrentContextOrganization>(composer => composer
.With(o => o.Id, orgId));
fixture.Customize<OrganizationUser>(composer => composer