uDIG

Unresolved merge conflict

Details

Description

There are conflict markers and duplicate messages in net.refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/internal/messages_de.properties.

Activity

Ascending order - Click to sort in descending order
Cory Horner made changes -
Field Original Value New Value
Assignee Jody Garnett [ jgarnett ] Cory Horner [ chorner ]
Component/s website, userguide and translations [ 11132 ]
Andrea Antonello made changes -
Fix Version/s UDIG 1.2.M4 [ 15071 ]
Hide
Permalink
Cory Horner added a comment -
resolved the conflict that was accidentally committed... I ended up keeping the original changes since the merged changes were merely whitespace, and the merge attempted to remove 4 translation tags which are still in use.
Show
Cory Horner added a comment - resolved the conflict that was accidentally committed... I ended up keeping the original changes since the merged changes were merely whitespace, and the merge attempted to remove 4 translation tags which are still in use.
Cory Horner made changes -
Resolution Fixed [ 1 ]
Fix Version/s UDIG 1.2.M4 [ 15071 ]
Fix Version/s UDIG 1.2.M3 [ 14979 ]
Status Open [ 1 ] Resolved [ 5 ]
Ben Walding made changes -
Workflow jira [ 97816 ] udig [ 107690 ]
Jody Garnett made changes -
Status Resolved [ 5 ] Closed [ 6 ]

People

  • Assignee:
    Cory Horner
    Reporter:
    Harald Wellmann
Vote (0)
Watch (0)

Dates

  • Created:
    Updated:
    Resolved: