This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch staging/1.5.5 in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit af6a5bb3a89c8c851c79ba80da77350141eac00c
Merge: 62b4f908 ce1e4b3d
Author: James Muehlner <james.muehl...@guac-dev.org>
AuthorDate: Thu Mar 14 09:44:29 2024 -0700
GUACAMOLE-1732: Merge locking fixes.
src/protocols/rdp/rdp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
