search

arncv / Intima

Bridging the Gap in Sexual Education
https://www.intima.tv
MIT License
15 stars 41 forks source link

Multi language support #48

Closed Gurnav224 closed 9 months ago

Gurnav224 commented 9 months ago

Screenshot from 2023-10-06 20-17-52 Screenshot from 2023-10-06 20-18-04 Screenshot from 2023-10-06 20-18-15 Screenshot from 2023-10-06 20-18-26

vercel[bot] commented 9 months ago

Someone is attempting to deploy a commit to a Personal Account owned by @arncv on Vercel.

@arncv first needs to authorize it.

vercel[bot] commented 9 months ago

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
intima ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 6, 2023 6:48pm
Gurnav224 commented 9 months ago

Hi @arncv I remove all the conflicts

arncv commented 9 months ago

Hey @Gurnav224 ,

I've been working on merging the changes from your repo, but have run into some persistent conflicts. Despite spending a couple of hours on manual resolutions, they remain.

To streamline the process and make integration smoother, could you please sync your current fork with the latest changes in the main branch? This might resolve some of the underlying issues. git pull I genuinely appreciate your contribution and patience. Let's work together to get this resolved.