From d53c344a702f489fd1771ba8cb23d8fb87ababcc Mon Sep 17 00:00:00 2001
From: Set Sakrecoer <set@sakrecoer.com>
Date: Wed, 19 Jun 2019 16:36:59 +0200
Subject: [PATCH] resolve conflicts

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

diff --git a/index.html b/index.html
index 1bf0dd2..d00dc3d 100644
--- a/index.html
+++ b/index.html
@@ -87,11 +87,7 @@ poster_image: /assets/vid/intro_loop_.jpg
       <a href="{{ base }}{{ page.url }}" title="{{ page.title }}"><div class="highlights" style="background-image: url('{{ base }}{{ page.image }}')">
       </div><h3>{{ page.title }} </h3></a>
       <p class="editable">
-<<<<<<< HEAD
         Highlights are music-things we think you want to discover. Tracks, articles, videos, interviews and reviews, curated but also original content. They are delivered to you daily. Here or via RSS.
-=======
-        Highlights are things we think you want to discover. Tracks, articles, videos, interviews and reviews, curated but also original content. They are delivered to you daily. Here or via RSS.
->>>>>>> content
       </p>
 {% endfor %}