Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

navbar enhancements in design #146

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

manpreet244
Copy link

WhatsApp.Video.2024-05-17.at.19.28.29.mp4

updattion in ui design of navbar

Copy link

vercel bot commented May 17, 2024

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
Copy link
Author

manpreet244 commented May 17, 2024

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 ,,

@manpreet244 manpreet244 mentioned this pull request May 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant