Fix merge fail

This commit is contained in:
Maxime Augier 2022-11-28 10:08:58 +01:00
parent f0ae726c9d
commit 4e5e257f24

View File

@ -16,11 +16,11 @@
} else {
<span class="open">Inscriptions ouvertes.</span>
}
} else{
} else {
<span class="closed">Inscriptions fermées.</span>
}
</p>
@if !instance.description.trim().is_empty() || contact.is_some() {
</p>
@if !instance.description.trim().is_empty() || contact.is_some() {
<div class="instance-info">
@if !instance.description.trim().is_empty() {
<h5 class="instance-description">Description:</h5>
@ -30,14 +30,10 @@
</div>
</div>
}
@if let Some(contact) = contact {
<h5 class="instance-admin">Administré par:</h5>
@:admin(contact, base)
}
</div>
@if let Some(contact) = contact {
<h5 class="instance-admin">@instance.title's admin:</h5>
@:admin(contact, base)
<h5 class="instance-admin">Administré par:</h5>
@:admin(contact, base)
}
}
</section>