From ef32bb3a9454971b86ef28f6892a181ae8ecbb5a Mon Sep 17 00:00:00 2001
From: "annalisa.webdev" <annalisa.webdev@gmail.com>
Date: Mon, 22 Apr 2024 19:09:43 +0200
Subject: [PATCH] fix countown

---
 _includes/cft.html | 4 ----
 _sass/cft.sass     | 4 ----
 index.html         | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/_includes/cft.html b/_includes/cft.html
index fc33d61..5a184fc 100644
--- a/_includes/cft.html
+++ b/_includes/cft.html
@@ -34,10 +34,6 @@ <h3 class="text-title mb-1" style="color: #ffffff">
     <a
       class="page-scroll btn-outline btn-purple mb-5 btn-purple"
       href="https://sessionize.com/code-beam-lite-stockholm-2023-copy/"
-<<<<<<< HEAD
       >SUBMIT</a>
-=======
-      >SUBMIT YOUR TALK </a>
->>>>>>> 2e4988892a1dd93177e3c8e5bac4ef9b929dfbe5
   </div>
 </div>
diff --git a/_sass/cft.sass b/_sass/cft.sass
index c309bbf..8c879c2 100644
--- a/_sass/cft.sass
+++ b/_sass/cft.sass
@@ -1,9 +1,5 @@
 .cft
-<<<<<<< HEAD
     background-color: linear-gradient(to right, #122B01, #4DBA12)
-=======
-    background-color: #323334
->>>>>>> parent of 77a01fd (gradient background)
     color: #fff
     .title
         color: #ffffff
diff --git a/index.html b/index.html
index eca8e21..6e37acd 100644
--- a/index.html
+++ b/index.html
@@ -3,13 +3,8 @@
 title: Code BEAM Lite Stockholm 2024
 image: assets/images/CB_STO_2024_1920x1080-4.jpg
 countdown: true
-<<<<<<< HEAD
 timezone: Europe/Lisbon
 deadline: 2024-05-13 00:01
-=======
-timezone: Europe/Stockholm
-deadline: 2024-05-13 08:59
->>>>>>> 97a59fa9b2c04089cd94277958952a6586a32f27
 ---
 {% include cover.html %}
 <!-- end of cover -->