Merge conflict

This commit is contained in:
zandercymatics 2024-11-20 09:02:19 -07:00
parent 20c0813f78
commit 908e06c8eb
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
7 changed files with 20 additions and 21 deletions

View file

@ -812,7 +812,7 @@ class MemberExportTest(MockDbForIndividualTests, MockEppLib):
@override_flag("organization_members", active=True)
@less_console_noise_decorator
def test_member_export(self):
"""Tests the member export report"""
"""Tests the member export report by comparing the csv output."""
content_type = ContentType.objects.get_for_model(PortfolioInvitation)
LogEntry.objects.create(
user=self.lebowski_user,