From 4e5e257f24a0197925fdd1a18cd63e80b76fd019 Mon Sep 17 00:00:00 2001
From: Maxime Augier <max@xolus.net>
Date: Mon, 28 Nov 2022 10:08:58 +0100
Subject: [PATCH] Fix merge fail

---
 templates/instance.rs.html | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/instance.rs.html b/templates/instance.rs.html
index 6125e93..e8e6ad8 100644
--- a/templates/instance.rs.html
+++ b/templates/instance.rs.html
@@ -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>