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

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.

People

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

Dates

  • Created:
    Updated:
    Resolved: