From cc95119cae4bc3417bcaac50af3bdd54ef3c1ad1 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:44:57 +0000
Subject: [PATCH] Code cleanup

---
 opendj-server-legacy/src/messages/org/opends/messages/tool.properties |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
index 2504872..7eb46a1 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
@@ -842,8 +842,6 @@
 INFO_INSTALLDS_PROMPT_BASEDN_504=Provide the base DN for the directory data:
 INFO_INSTALLDS_PROMPT_IMPORT_FILE_506=Please specify the path to the LDIF \
  file containing the data to import:
-ERR_INSTALLDS_TWO_CONFLICTING_ARGUMENTS_507=ERROR:  You may not \
- provide both the %s and the %s arguments at the same time
 INFO_INSTALLDS_PROMPT_LDAPPORT_509=On which port would you like the Directory \
  Server to accept connections from LDAP clients?
 ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT_510=ERROR:  Unable to \
@@ -1023,8 +1021,6 @@
  written
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=Path to a MakeLDIF template to \
  use to generate the import data
-ERR_LDIFIMPORT_CONFLICTING_OPTIONS_604=The %s and %s arguments are \
- incompatible and may not be used together
 ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=Neither the %s or the %s \
  argument was provided.  One of these arguments must be given to specify the \
  source for the LDIF data to be imported
@@ -1120,8 +1116,6 @@
  when establishing SSL/TLS communication with the server
 INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PINFILE_652=Path to a file \
  containing the PIN needed to access the contents of the trust store
-ERR_LDAPPWMOD_CONFLICTING_ARGS_656=The %s and %s arguments may not be \
- provided together
 ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER_657=If either a bind DN \
  or bind password is provided, then the other must be given as well
 ERR_LDAPPWMOD_ANON_REQUIRES_AUTHZID_AND_CURRENTPW_658=If a bind DN and \
@@ -1209,8 +1203,6 @@
  index data is consistent within an indexed backend database
 INFO_WAIT4DEL_TOOL_DESCRIPTION_701=This utility can be used to wait for a \
  file to be removed from the filesystem
-ERR_TOOL_CONFLICTING_ARGS_702=You may not provide both the --%s and \
- the --%s arguments
 ERR_LDAPCOMPARE_NO_ATTR_703=No attribute was specified to use as the \
  target for the comparison
 ERR_LDAPCOMPARE_INVALID_ATTR_STRING_704=Invalid attribute string '%s'. \
@@ -1746,8 +1738,6 @@
  weight
 ERR_INITIALIZE_SERVER_ROOT_1293=An unexpected error occurred \
   attempting to set the server's root directory to %s: %s
-ERR_LDAP_CONN_MUTUALLY_EXCLUSIVE_ARGUMENTS_1294=ERROR:  You may not \
- provide both the %s and the %s arguments
 ERR_LDAP_CONN_CANNOT_INITIALIZE_SSL_1295=ERROR:  Unable to perform SSL \
  initialization:  %s
 ERR_LDAP_CONN_CANNOT_PARSE_SASL_OPTION_1296=ERROR:  The provided SASL \

--
Gitblit v1.10.0