From 79a8669d6be5ac1fe2f1b62e3a48568200bd3148 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 22 Aug 2007 07:36:24 +0000
Subject: [PATCH] issue 1804 : Ensure that conflicts are visible to administrators

---
 opends/src/messages/messages/replication.properties |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opends/src/messages/messages/replication.properties b/opends/src/messages/messages/replication.properties
index 0083d79..0b61dc0 100644
--- a/opends/src/messages/messages/replication.properties
+++ b/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
\ No newline at end of file
+ information will be ignored
+NOTICE_UNRESOLVED_CONFLICT_69=An unresolved conflict was detected for DN %s
\ No newline at end of file

--
Gitblit v1.10.0