Unresolved merge conflict

Details

Type: Bug
Status: Closed
Priority: Minor
Resolution: Fixed
Affects Version/s: UDIG 1.2.M1
Fix Version/s: UDIG 1.2.M3
Component/s: catalog, metadata and search, website, userguide and translations
Labels:
None

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 - 15/Mar/09 1:22 AM

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 - 15/Mar/09 1:22 AM 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:

18/Nov/08 10:28 AM

Updated:

15/Aug/10 4:13 AM

Resolved:

15/Mar/09 1:22 AM