merge

frontend/assets/css/tailwind.css

@@ -120,15 +120,20 @@
     --breakpoint-xs: 480px;
 
     /* ANIMATIONS */
+<<<<<<< HEAD
     --animate-marquee: marquee 3s linear infinite;
     --animate-slide-down: slideDown 300ms ease-out;
     --animate-slide-up: slideUp 300ms ease-out;
     --animate-overlay-show: overlayShow 150ms ease-in;
     --animate-content-show: contentShow 150ms ease-in;
+=======
+    --animate-marquee: marquee 25s linear infinite;
+    --animate-marquee-reverse: marquee 25s linear infinite reverse;
+>>>>>>> be4fa509843c81855f5ffc118150196c94a7b17b
 
     @keyframes marquee {
         to {
-            transform: translateY(-50%);
+            transform: translateX(50%);
         }
     }