This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-manual.git
from 2033ce6 Merge 1.5.3 changes back to master.
add 4ec4c07 GUACAMOLE-1833: Clean up merge conflict markers in source.
new d6d66ca GUACAMOLE-1833: Merge removal of merge conflict markers.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/jdbc-auth.md | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
