Omkar-Sonawane-23 / VedicVani

https://vedic-vani.vercel.app
27 stars 41 forks source link

navbar enhancements in design #146

Open manpreet244 opened 6 months ago

manpreet244 commented 6 months ago

https://github.com/Omkar-Sonawane-23/VedicVani/assets/63246393/137101e3-52b9-40a6-a7c2-c9c904b1f773

updattion in ui design of navbar

vercel[bot] commented 6 months ago

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

Name Status Preview Comments Updated (UTC)
vedic-vani-gagp ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 17, 2024 2:18pm
manpreet244 commented 6 months ago

WhatsApp.Video.2024-05-17.at.19.28.29.mp4 updattion in ui design of navbar

When I do git pull it create merge conflict in navbar.jsx Umm, I think I have deleted the code that create merge conflicts ,sorry for that,I am new to git ,can anybody tell me how to remove merge conflict,

@Omkar-Sonawane-23 @mohit1721 can u help ,how to deal with merge conflicts as I also have updated the navbar ,and some other person also ,,