From 953b770e3564e8b7adc5c07c07e0cb1a63d7beb5 Mon Sep 17 00:00:00 2001 From: EP Date: Fri, 7 Mar 2025 17:34:59 -0500 Subject: [PATCH] Fix remaining merge conflict markers in index.html --- index.html | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/index.html b/index.html index 6221735..4894a85 100644 --- a/index.html +++ b/index.html @@ -177,6 +177,7 @@ .r00ts-brand:hover::after { transform: scaleX(1); transform-origin: left; + } .header { text-align: center; margin-bottom: 30px; @@ -312,26 +313,11 @@ opacity: 0.5; font-size: 0.8rem; font-family: 'Share Tech Mono', monospace; -======= - margin: 20px 0; - } - .stat-box { - text-align: center; - padding: 10px; - background-color: #ffffff; - border-radius: 5px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); - flex: 1; - margin: 0 10px; ->>>>>>> 6fcedc69cfea5193a6809e1f2fb705b42479c5bd } -<<<<<<< HEAD
-======= ->>>>>>> 6fcedc69cfea5193a6809e1f2fb705b42479c5bd

R00TS

@@ -341,11 +327,7 @@
-<<<<<<< HEAD -======= - ->>>>>>> 6fcedc69cfea5193a6809e1f2fb705b42479c5bd
@@ -375,8 +357,6 @@
-======= ->>>>>>> 6fcedc69cfea5193a6809e1f2fb705b42479c5bd