From 7146c5e6d46ae233c70ef609d6802ffa1bdb8f40 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 3 Jun 2025 12:25:38 +0200 Subject: [PATCH] CSS: Fix merge error Signed-off-by: Michael Tremer --- html/html/themes/ipfire/include/css/style.css | 3 --- 1 file changed, 3 deletions(-) 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 { -- 2.39.5