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

Gaetan Boismal
25.30.2016 6ea56ecde3d05b84f42a7338d7c2c159817d00d0
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -23,7 +23,6 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CliMessages.ERR_TOOL_CONFLICTING_ARGS;
import java.io.File;
import java.io.OutputStream;
@@ -225,8 +224,7 @@
    {
      if (templateFile.isPresent())
      {
        printWrappedText(err,
            ERR_TOOL_CONFLICTING_ARGS.get(ldifFiles.getLongIdentifier(), templateFile.getLongIdentifier()));
        printWrappedText(err, conflictingArgsErrorMessage(ldifFiles, templateFile));
        return 1;
      }
    }