From 49f64b0054247bfb56b12c550ffc4d409914a3ea Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Wed, 28 Feb 2024 17:47:24 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20=E2=80=94=20Remove=20merge=20lef?=
 =?UTF-8?q?tover?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 argos/server/templates/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/argos/server/templates/index.html b/argos/server/templates/index.html
index 39de729..9a31d76 100644
--- a/argos/server/templates/index.html
+++ b/argos/server/templates/index.html
@@ -2,7 +2,6 @@
 {% block title %}<h2>Dashboard</h2>{% endblock title %}
 {% block content %}
     <div id="domains" class="frame">
-<<<<<<< HEAD
         <nav>
             <ul>
                 <li>