syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/2] syncope git commit: Fix typo
Date Fri, 06 Oct 2017 15:11:19 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X a1b698a86 -> 01d6b62ee
  refs/heads/master 4a09ce282 -> 2203133a7


Fix typo


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/01d6b62e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/01d6b62e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/01d6b62e

Branch: refs/heads/2_0_X
Commit: 01d6b62ee87bdb534395bcc6171e85687dee6f07
Parents: a1b698a
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Fri Oct 6 17:10:11 2017 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Fri Oct 6 17:11:02 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/01d6b62e/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/01d6b62e/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


Mime
View raw message