Skip to content

Commit 09a79a1

Browse files
committed
fix vercel merge error
1 parent 34eb9f1 commit 09a79a1

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

app/admissions/page.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,11 @@ export default function AdmissionsPage() {
4949
</div>
5050

5151
{/* CRITICAL ALERT - CSCA */}
52-
<motion.div className="mb-24 rounded-3xl overflow-hidden border-l-8 border-amber-500 bg-amber-50/80 backdrop-blur-sm shadow-lg"
52+
<motion.div
53+
className="mb-16 md:mb-24 rounded-2xl md:rounded-3xl overflow-hidden border-l-4 md:border-l-8 border-amber-500 bg-amber-50/80 backdrop-blur-sm shadow-lg"
5354
initial={{ opacity: 0, scale: 0.95 }}
5455
animate={{ opacity: 1, scale: 1 }}
5556
transition={{ delay: 0.2 }}
56-
<<<<<<< HEAD
57-
className="mb-16 md:mb-24 rounded-2xl md:rounded-3xl overflow-hidden border-l-4 md:border-l-8 border-amber-500 bg-amber-50/80 backdrop-blur-sm shadow-lg"
58-
=======
59-
>>>>>>> be9eba52bfab0cd188737887e321e30b5e3ab101
6057
>
6158
<div className="p-5 md:p-12">
6259
<div className="flex items-start gap-3 md:gap-4 mb-4 md:mb-6">

0 commit comments

Comments
 (0)