Projects >> elasticsearch >>687aadef00b87b369ca935a1514e37a7b679609c

Chunk
Conflicting content 
import org.apache.log4j.varia.NullAppender;
import org.elasticsearch.cli.MultiCommand;
import org.elasticsearch.common.cli.Terminal;
<<<<<<< HEAD
=======
import org.elasticsearch.common.logging.LogConfigurator;
>>>>>>> d079830f10ca161dbf0280c845df33de5425be72
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.node.internal.InternalSettingsPreparer;
Solution content 
import org.apache.log4j.varia.NullAppender;
import org.elasticsearch.cli.MultiCommand;
import org.elasticsearch.common.cli.Terminal;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.node.internal.InternalSettingsPreparer;
File
PluginCli.java
Developer's decision
Version 1
Kind of conflict
Import