Changes between Initial Version and Version 1 of Ticket #17207


Ignore:
Timestamp:
2019-01-20T19:12:37+01:00 (7 years ago)
Author:
Don-vip
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #17207

    • Property Keywords conflict added
    • Property Summary Resolve conflict doesn't work anymore → NPE at conflict.pair.AbstractListMergeModel.copy

  • Ticket #17207 – Description

    initial v1  
    99The message shown in the picture will then appear.
    1010==== Please provide any additional information below. Attach a screenshot if possible.
     11
     12[[Image(Resolve conflict.png, 1000px)]]
    1113
    1214{{{