This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-manual.git
commit d6d66caeafe3a6601522b0c1380372f84c72c550
Merge: 2033ce6 4ec4c07
Author: Mike Jumper <mjum...@apache.org>
AuthorDate: Fri Jul 14 10:13:29 2023 -0700
GUACAMOLE-1833: Merge removal of merge conflict markers.
src/jdbc-auth.md | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
