Uploaded image for project: 'Guacamole'
  1. Guacamole
  2. GUACAMOLE-1833

Merge conflict markers left in guacamole-manual source

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • 1.6.0
    • 1.6.0
    • None
    • None

    Description

      There are some merge conflict markers in the guacamole-manual master branch, here and here.

      It looks like these were probably accidentally left in when merging release branches back to master. They should be cleaned up.

      Attachments

        Issue Links

          is caused by

          Bug - A problem which impairs or prevents the functions of the product. GUACAMOLE-1253 Hitting 2100 SQLServer query parameter limit with large user base

          • Minor - Minor loss of function, or other problem where easy workaround is present.
          • Closed

          Activity

            People

              Unassigned Unassigned
              jmuehlner James Muehlner
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: