From c22b9acf60ff199570d56e26bb73ef157d761502 Mon Sep 17 00:00:00 2001
From: buttercat1791 <mjjurkoic@gmail.com>
Date: Tue, 8 Apr 2025 08:52:23 -0500
Subject: [PATCH] Clean up git merge conflict annotations

---
 src/styles/publications.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/styles/publications.css b/src/styles/publications.css
index 4db6c03..ef47200 100644
--- a/src/styles/publications.css
+++ b/src/styles/publications.css
@@ -230,7 +230,6 @@
         @apply w-full;
     }
 
-<<<<<<< HEAD
     .coverImage {
         @apply max-h-[230px] overflow-hidden;
     }
@@ -258,7 +257,8 @@
                 @apply filter grayscale sepia brightness-75 opacity-50 transition duration-500 ease-in-out saturate-200 hue-rotate-20;
             }
         }
-=======
+    }
+
     /* Discrete headers */
     h3.discrete,
     h4.discrete,
@@ -281,6 +281,5 @@
 
     h6.discrete {
         @apply text-base font-semibold;
->>>>>>> 279fb7ce5912d50a1400636fa27aafab315df0b4
     }
 }
\ No newline at end of file