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 871bbadc10fa190984e60539de6981075aace003..b658a74e62743ce15bfebc53745ef27c7aebc8f2 100644 (file)
--- 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 {