PROD.2025/DataRush
1
0
Fork 0
mirror of https://gitlab.com/megazordpobeda/DataRush.git synced 2026-05-23 01:37:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: build

Browse Source
This commit is contained in:
moolcoov
2025-03-01 14:02:28 +03:00
parent e1adf638e1
commit 7e1891a81b
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/frontend/src/pages/CompetitionSession/index.tsx
+2 -10
View File
@@ -45,21 +45,13 @@ const CompetitionRunnerPage = () => {
}; };
return ( return (
<<<<<<< HEAD:services/frontend/src/pages/CompetitionRunnerPage/index.tsx
<> <>
<div className="sticky top-0 z-10 bg-white"> <div className="sticky top-0 z-10 bg-white">
<div className="max-w-6xl mx-auto px-4"> <div className="mx-auto max-w-6xl px-4">
<div className="py-3 text-center"> <div className="py-3 text-center">
<h1 className="text-lg font-semibold font-hse-sans">{competitionTitle}</h1> <h1 className="font-hse-sans text-lg font-semibold">
=======
<>
<div className="sticky top-16 z-10 border-b border-gray-200 bg-white shadow-sm">
<div className="container mx-auto px-4">
<div className="py-4">
<h1 className="font-hse-sans text-xl font-semibold">
{competitionTitle} {competitionTitle}
</h1> </h1>
>>>>>>> 58f493250150ba62ac4f325a0708b96eb88661e9:services/frontend/src/pages/CompetitionSession/index.tsx
</div> </div>
<div className="no-scrollbar flex items-center justify-center gap-2 overflow-x-auto pb-3"> <div className="no-scrollbar flex items-center justify-center gap-2 overflow-x-auto pb-3">