mike-jumper commented on PR #916: URL: https://github.com/apache/guacamole-client/pull/916#issuecomment-1751237921
**NOTE:** There are merge conflicts against `master` if/when these changes are merged back. The conflicts are against `package.json` and `package-lock.json` because of the additional `fuzzysort` dependency on `master`. The conflicts look mercifully minor. Combining the `fuzzysort` lines with what's already present from these updates resolves the conflict and looks to build without issue. -- 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]
