Closed lexzee closed 8 months ago
The latest updates on your projects. Learn more about Vercel for Git ↗︎
Name | Status | Preview | Comments | Updated (UTC) |
---|---|---|---|---|
website | ✅ Ready (Inspect) | Visit Preview | 💬 Add feedback | Dec 20, 2023 7:03am |
Hey @lexzee, could you please fix the merge conflicts so that we can merge your PR :)
Hi! It is not an error but a merge conflict, it is when two different versions of Git Files have to be merged together: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
If you need any help, let us know and we'd be happy to help!
I have resolved the conflict
@lexzee have you pushed your changes after resolving it? It still shows conflicts over here
@xkrishguptaa the conflict should have been resolved now
Thank you for your contribution!
Fixes Issue
Closes #308
Changes proposed
Check List (Check all the applicable boxes)
Screenshots
Note to reviewers