external-software/github_OpenIdentityPlatform_OpenDJ.git

external-software / github_OpenIdentityPlatform_OpenDJ

mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

summary
commits
tree
docs
forks
compare

issue 1804 : Ensure that conflicts are visible to administrators

gbellato

22.36.2007 79a8669d6be5ac1fe2f1b62e3a48568200bd3148

 opends/src/messages/messages/replication.properties

@@ -186,4 +186,5 @@
 ChangeNumber %s error %s %s
MILD_ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL_68=The entry %s has historical \
 information for attribute %s which is not defined in the schema. This \
 information will be ignored
 information will be ignored
NOTICE_UNRESOLVED_CONFLICT_69=An unresolved conflict was detected for DN %s

			@@ -186,4 +186,5 @@
			ChangeNumber %s error %s %s
			MILD_ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL_68=The entry %s has historical \
			information for attribute %s which is not defined in the schema. This \
			information will be ignored
			information will be ignored
			NOTICE_UNRESOLVED_CONFLICT_69=An unresolved conflict was detected for DN %s