From 4b55b0b392a20cb104660b7aa0c82efacf2350df Mon Sep 17 00:00:00 2001
From: jacek-oet <jacek.bendig@openenergytransition.org>
Date: Mon, 5 Aug 2024 09:57:38 +0200
Subject: [PATCH] fix: remove git conflict in disclaimer (#49)

---
 disclaimer.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/disclaimer.html b/disclaimer.html
index 39f45b8..3b7dfab 100644
--- a/disclaimer.html
+++ b/disclaimer.html
@@ -28,11 +28,7 @@
     <!-- Twitter Meta Tags -->
     <meta name="twitter:card" content="summary_large_image"/>
     <meta name="twitter:title" content="Open Energy Transition"/>
-<<<<<<< HEAD
     <meta name="twitter:description" content="Open Energy Transition is a non-profit environmental think tank and software company dedicated to tackling energy planning challenges. We specialize in open energy system planning, providing comprehensive consulting, software development, and training services. Our mission is to empower better decision-making by harnessing the power of openness. Join us in shaping a sustainable and efficient energy future."/>
-=======
-    <meta name="twitter:description" content="Open Energy Transition is a non-profit think tank and software provider revolutionizing the global shift towards sustainable energy. We offer innovative, open-source energy planning solutions, comprehensive support, and collaborative opportunities. Join us in driving sustainable, affordable, and accessible energy solutions for all."/>
->>>>>>> main
     <meta name="twitter:image" content="https://openenergytransition.org/assets/img/website_screenshot.png"/>
 
     <!-- Meta Tags Generated via http://heymeta.com -->