Closed deekay1712 closed 3 years ago
Thanks for the PR. You probably re-forked this repo to get rid of merge conflicts, while that worked but now as there is one more commit, new merge conflicts appeared. Kindly resolve them.
Click on the resolve conflicts button. It would take you to app.js and highlight the lines that are causing a conflict. Just remove the merge conflict indicators.
Doing this includes the changes both from your branch and the current main branch. If you are facing trouble you can ping me on gitter ( https://gitter.im/JustCallingRandomAPI/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge )
Thanks for the PR. You probably re-forked this repo to get rid of merge conflicts, while that worked but now as there is one more commit, new merge conflicts appeared. Kindly resolve them.
Click on the resolve conflicts button. It would take you to app.js and highlight the lines that are causing a conflict. Just remove the merge conflict indicators.
Doing this includes the changes both from your branch and the current main branch. If you are facing trouble you can ping me on gitter ( https://gitter.im/JustCallingRandomAPI/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge )
Hey, I've resolved the conflicts.
Thanks for the PR.
Description
Added Numbers Api to get History of the day
Screenshot
Checklist