[udig-devel] [jira] Created: (UDIG-1455) Unresolved merge conflict

["Harald Wellmann (JIRA)" <jira@xxxxxxxxxxxx>]

Unresolved merge conflict
-------------------------

                 Key: UDIG-1455
                 URL: http://jira.codehaus.org/browse/UDIG-1455
             Project: uDIG
          Issue Type: Bug
          Components: catalog
    Affects Versions: UDIG 1.2
            Reporter: Harald Wellmann
            Assignee: Jody Garnett
            Priority: Minor


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

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira