TL: forgot to save ...

Parallel-in-Time · Jul 16, 2023 · 1c32ab4 · 1c32ab4
1 parent 9af3a37
commit 1c32ab4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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>