github-actions[bot] commented on PR #7379: URL: https://github.com/apache/texera/pull/7379#issuecomment-5212123548
The cherry-pick **conflicted** and was committed with conflict markers. Resolve the conflicts on this branch, then mark this PR ready for review. **Conflicting files:** - `frontend/package.json` - `frontend/yarn.lock` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
