You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/10/06 15:11:20 UTC
[2/2] syncope git commit: Fix typo
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2203133a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2203133a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2203133a
Branch: refs/heads/master
Commit: 2203133a7bd5953371965c7c88f8f7c2366852e6
Parents: 4a09ce2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 6 17:10:11 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 6 17:11:09 2017 +0200
----------------------------------------------------------------------
.../client/console/policies/PolicySpecModalPanel.properties | 2 +-
.../client/console/policies/PolicySpecModalPanel_pt_BR.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2203133a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel.properties
index a9c8a51..a1bc5cf 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel.properties
@@ -21,4 +21,4 @@ JSON=Plain attributes
JAVA=Java Class
any.type=Applies to
correlationRules=Correlation Rules
-conflictResolutionAction=Conflice Resolution Action
+conflictResolutionAction=Conflict Resolution Action
http://git-wip-us.apache.org/repos/asf/syncope/blob/2203133a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel_pt_BR.properties
index a9c8a51..a1bc5cf 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicySpecModalPanel_pt_BR.properties
@@ -21,4 +21,4 @@ JSON=Plain attributes
JAVA=Java Class
any.type=Applies to
correlationRules=Correlation Rules
-conflictResolutionAction=Conflice Resolution Action
+conflictResolutionAction=Conflict Resolution Action