From 1c32ab4feb16819fbb18fbad13f1290d6e37a5ac Mon Sep 17 00:00:00 2001
From: Thibaut Lunet <thibaut.lunet@tuhh.de>
Date: Sun, 16 Jul 2023 21:28:52 +0200
Subject: [PATCH] TL: forgot to save ...

---
 dynamic_site/templates/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dynamic_site/templates/index.html b/dynamic_site/templates/index.html
index cb3dcdf..ab4b0e4 100644
--- a/dynamic_site/templates/index.html
+++ b/dynamic_site/templates/index.html
@@ -60,11 +60,7 @@
         <div uk-grid>
           <div class="uk-width-1-1">
             <h1 class="uk-heading uk-heading-line uk-text-center">
-<<<<<<< HEAD
-              <span> Call of PinTy : BlockOps</span>
-=======
               <span> {{ title }} </span>
->>>>>>> 71af975be32b630d3dc81f3939d370769b0ee6fb
             </h1>
           </div>