From 37cf6dbbaf0bb4af9a5b56a409047b0c78ba38c1 Mon Sep 17 00:00:00 2001
From: celine <celine@hyperlink.academy>
Date: Tue, 7 Apr 2026 16:54:05 -0400
Subject: [PATCH] fix stray merge conflict

---
 app/globals.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/globals.css b/app/globals.css
index 156f9e08..851bee3f 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -606,15 +606,13 @@ pre.shiki {
   overflow: hidden;
   transition:
     max-height 200ms ease,
-<<<<<<< HEAD
-    mask-image 200ms ease;
-=======
+    max-image 200ms ease,
     opacity 200ms ease;
   background: rgba(var(--bg-page), var(--bg-page-alpha));
   border-radius: 4px;
   padding: 4px 6px;
->>>>>>> 9980796e1a77eb0fcad4be7b11d60d4f14e78589
 }
+
 .footnote-side-item:not(:hover):not(:focus-within):not(.footnote-side-focused) {
   max-height: calc(4.5em + 8px);
   opacity: calc(var(--bg-page-alpha) * 0.7);
-- 
2.51.2