Uploaded image for project: 'Falcon'
  1. Falcon
  2. FALCON-1388

Fix merge conflicts produced by FALCON-1002

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Blocker
    • Resolution: Fixed
    • 0.6.1
    • 0.7
    • merlin
    • None

    Description

      FALCON-1002 produced few merge conflicts thus falcon-regression build fails.

      Attachments

        1. FALCON-1388.diff
          3 kB
          Paul Isaychuk

        Issue Links

          links to

          Web Link review-board

          Activity

            People

              pisaychuk Paul Isaychuk
              pisaychuk Paul Isaychuk
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: