You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@guacamole.apache.org by GitBox <gi...@apache.org> on 2020/11/19 12:57:28 UTC

[GitHub] [guacamole-client] sporeno commented on pull request #504: GUACAMOLE-1056: Add support for tracking the time drift between guacamole and TOTP-tokens

sporeno commented on pull request #504:
URL: https://github.com/apache/guacamole-client/pull/504#issuecomment-730358168


   > You have an extra commit ([8239c16](https://github.com/apache/guacamole-client/commit/8239c16ddda778bd8ba4c140ae07cc7ab2d5cf9e)), now, that needs to be removed.
   
   Commit removed, I was created by resolving the conflict. Now it's present again. 
   What have I to do to resolf it?
   


----------------------------------------------------------------
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:
users@infra.apache.org