muizenval

commit d598b78207c195c38324332de7cfeeb69500aa30
parent 805aa251c1563aa8165a7679dee84b69c7cf4bdc
Author: NibbaNamedHassan <[email protected]>
Date:   Tue, 28 Jun 2022 15:43:53 +0200

after merge

Diffstat:
M
server/templates/layout.html
 | 
6
++++++

1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/templates/layout.html b/server/templates/layout.html
@@ -73,6 +73,7 @@
         </div>
 
 <<<<<<< HEAD
+<<<<<<< HEAD
     <div class="main-container d-flex">
         <div class="sidebar" id="side_nav">
           <div class="header-box px-2 pt-3 pb-4">
@@ -103,6 +104,8 @@
         <li class=""><a href="{{ url_for('register') }}" class="text-decoration-none px-3 py-2 d-block"><i class="far fa-user"></i> Registreren</a></li>
         {% endif %}
 =======
+=======
+>>>>>>> cdc54f9efef31c60b062d347b41fb859b414092e
         <ul class="list-unstyled px-2">
             <li class=""><a href="{{ url_for('index') }}" class="text-decoration-none px-3 py-2 d-block"><i
                         class="far fa-map-marker-question"></i>Home</a></li>
@@ -131,6 +134,9 @@
             <li class=""><a href="{{ url_for('register') }}" class="text-decoration-none px-3 py-2 d-block"><i
                         class="fas fa-sign-out"></i>Registeren</a></li>
             {% endif %}
+<<<<<<< HEAD
+>>>>>>> cdc54f9efef31c60b062d347b41fb859b414092e
+=======
 >>>>>>> cdc54f9efef31c60b062d347b41fb859b414092e
         </ul>
         <hr class="h-color mx-2">