EandrewJones commented on PR #476: URL: https://github.com/apache/flagon-useralejs/pull/476#issuecomment-2223124643
@Suvendu-UI There's a tiny conflict that needs to be resolved before we can merge this. You should be able to: 1. rebase this branch on top of the latest changes from `master` 2. select either `package-lock.json` file, i.e. `git checkout --ours package-lock.json` 3. reinstall, build, and push Pinging @Jyyjy for his final look over. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@flagon.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@flagon.apache.org For additional commands, e-mail: notifications-h...@flagon.apache.org