Abhay3333
commented
1 month ago Fix: Resolve merge conflicts and update files
This commit resolves conflicts in the following files:
- README.md
- emoji/emoji.js
- index.html
- js/infinite-scroll.js
- js/main.js
- js/usernameSelection.js
- js/usernames.js
- package.json
- yarn.lock
Updated the code to ensure compatibility with the latest changes from the main branch.
Resolves: #123
Issue solved