necouchman commented on pull request #504: URL: https://github.com/apache/guacamole-client/pull/504#issuecomment-731360150
> What have I to do to resolve it? Make sure that your forked copy of the `master` branch of the repo is up-to-date, and then rebase your `TOTPTimeDrift` branch on top of `master` via the command `git rebase master`. You'll likely run into the conflicts there and you'll need to resolve them. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
