hansva commented on a change in pull request #746:
URL: https://github.com/apache/incubator-hop/pull/746#discussion_r614596582



##########
File path: 
ui/src/main/resources/org/apache/hop/ui/hopgui/file/workflow/messages/messages_it_IT.properties
##########
@@ -152,13 +152,13 @@ HopGui.Entries=Entry
 HopGui.Error=Errore
 HopGui.Error.UnableToLoadSharedObjects.Message=Errore durante il caricamento 
degli oggetti condivisi 
 HopGui.Error.UnableToLoadSharedObjects.Title=Errore
-HopGui.ErrorDialog.ErrorEditingAction.Message=Si � verificato un errore 
durante la modifica della action
+HopGui.ErrorDialog.ErrorEditingAction.Message=Si � verificato un errore 
durante la modifica della action

Review comment:
       merge conflict in file




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to