fix merge conflict

This commit is contained in:
zandercymatics 2024-09-27 13:23:31 -06:00
parent ef12c5e93e
commit 9a7a65d958
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7

View file

@ -119,7 +119,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
{% endfor %}
{% endwith %}
</div>
{% elif field.field.name == "display_admins" or field.field.name == "domain_managers" or field.field.namd == "invited_domain_managers" %}
{% elif field.field.name == "domain_managers" or field.field.name == "invited_domain_managers" %}
<div class="readonly">{{ field.contents|safe }}</div>
{% elif field.field.name == "display_members" %}
<div class="readonly">