Closed lazybug19 closed 4 weeks ago
Thank you for submitting your pull request! 🙌 We'll review it as soon as possible. In the meantime, please ensure that your changes align with our #24. If there are any specific instructions or feedback regarding your PR, we'll provide them here. Thanks again for your contribution! 😊
Follow the structure given in pull request template.
Resolve the conflicts!
Locally it says there are no conflicts and everytime I update the merged branch it shows the same files conflicting even though I have removed all commits in the conflicting files at this point.
Do one thing, close this PR. Clone this repo again in another place, then create a new PR with the modified files only.
Btw I asked you to remove package-lock.json. not package.json
Can be found in new pr #132
Fixes #5, #125
Screenshots