ourworld_web/www_ourverse_new
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict2

Browse Source
This commit is contained in:
ehab-hassan
2024-10-12 20:48:20 +03:00
parent 367aa003a3
commit 071b29d136
16 changed files with 0 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Bottom.jsx
View File

@@ -3,11 +3,7 @@ export default function Bottom() {
<div className="relative isolate overflow-hidden bg-gray-900">
<div className="px-6 py-24 sm:px-6 sm:py-32 lg:px-8">
<div className="mx-auto max-w-2xl text-center">
<<<<<<< HEAD
<h2 className="text-3xl font-bold tracking-tight text-gradient-light lg:text-5xl">
=======
<h2 className="text-3xl font-bold tracking-tight text-white lg:text-5xl">
>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
The Future of Collaboration
<br />
is now.
@@ -17,15 +13,10 @@ export default function Bottom() {
</p>
<div className="mt-10 flex items-center justify-center gap-x-6">
<a
<<<<<<< HEAD
href="#"
className="rounded-2xl btn-gradient-dark2 px-3.5 py-2.5 text-sm font-semibold text-gray-900 shadow-sm hover:bg-gray-100 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white"
=======
href="https://portal.ourverse.tf"
className="rounded-2xl btn-dark text-base font-semibold text-gray-900"
target="_blank"
rel="noopener noreferrer"c
>>>>>>> 4f67c29af8c9f32c55f43ef5bf9813c49a5735cd
>
Sign Up Now
</a>