search

vedangj044 / just-calling-random-api

React app to call various APIs. A place for new contributors to learn how to consume their APIs and contribute to open-source. Part of Hacktoberfest.
https://vedangj044.github.io/just-calling-random-api/
MIT License
25 stars 55 forks source link

Abstractapi #53

Closed MuditWadhwa closed 3 years ago

MuditWadhwa commented 3 years ago

I have used the Abstract API to allow the user to know whether a particular day in India is a public Holiday or not.It is present at the end of the page. Please view it and merge the PR to confirm my contribution to the project.

vedangj044 commented 3 years ago

Thanks for the PR. Can you try resolving the merge conflicts? You can follow the command line instructions provided there.

MuditWadhwa commented 3 years ago

Hey...Could you please give some clarity on how could these merge conflicts be solved?I have tried a lot but it works fine on my local machine....

vedangj044 commented 3 years ago

No problem, To resolve a merge conflict you first need to sync a fork ( https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork ) and then rebase your branch accordingly, for now, I have resolved them and merged the PR.

MuditWadhwa commented 3 years ago

Thanks a lot for assuring me that the issue was solved.I learned a lot from this project.Thanks for the advice as well as the learning experience!

vedangj044 commented 3 years ago

Thanks for the kind words !