[ https://issues.apache.org/jira/browse/GUACAMOLE-1833?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
James Muehlner updated GUACAMOLE-1833: -------------------------------------- Description: There are some merge conflict markers in the guacamole-manual master branch, [here|https://github.com/apache/guacamole-manual/blob/cda6f96fcbacf7122032ab59121dc6f344771dba/src/jdbc-auth.md?plain=1#L681-L702] and [here|https://github.com/apache/guacamole-manual/blob/cda6f96fcbacf7122032ab59121dc6f344771dba/src/jdbc-auth.md?plain=1#L735-L756]. It looks like these were probably accidentally left in when merging release branches back to master. They should be cleaned up. was: There are some merge conflict markers in the guacamole-manual master branch, [here|https://github.com/apache/guacamole-manual/blob/cda6f96fcbacf7122032ab59121dc6f344771dba/src/jdbc-auth.md?plain=1#L681-L702] and [here|[https://github.com/apache/guacamole-manual/blob/cda6f96fcbacf7122032ab59121dc6f344771dba/src/jdbc-auth.md?plain=1#L735-L756].] It looks like these were probably accidentally left in when merging release branches back to master. They should be cleaned up. > Merge conflict markers left in guacamole-manual source > ------------------------------------------------------ > > Key: GUACAMOLE-1833 > URL: https://issues.apache.org/jira/browse/GUACAMOLE-1833 > Project: Guacamole > Issue Type: Bug > Reporter: James Muehlner > Priority: Major > > There are some merge conflict markers in the guacamole-manual master branch, > [here|https://github.com/apache/guacamole-manual/blob/cda6f96fcbacf7122032ab59121dc6f344771dba/src/jdbc-auth.md?plain=1#L681-L702] > and > [here|https://github.com/apache/guacamole-manual/blob/cda6f96fcbacf7122032ab59121dc6f344771dba/src/jdbc-auth.md?plain=1#L735-L756]. > It looks like these were probably accidentally left in when merging release > branches back to master. They should be cleaned up. -- This message was sent by Atlassian Jira (v8.20.10#820010)