From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 3 Jun 2025 10:25:38 +0000 (+0200)
Subject: CSS: Fix merge error
X-Git-Tag: v2.29-core197~25^2~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=693a13928d95fa3e6d73c841f70b4f3eec9d78e8;p=ipfire-2.x.git

CSS: Fix merge error

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 871bbadc1..b658a74e6 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -515,13 +515,10 @@ table.form tr.action td form {
 .tbl .status.is-stopped, .tbl .status.is-disconnected {
 	background-color: var(--color-red);
 	color: var(--color-red-invert);
-<<<<<<< HEAD
 }
 
 .tbl .status.is-fixed {
 	width: 33%;
-=======
->>>>>>> 630a49b8d (ovpnmain.cgi: Refactor the connection listing)
 }
 
 .tbl .status.is-connecting {