Projects >> elasticsearch-jdbc >>c8e4c866517ef753dcadf299e5c56d5a577ed6e2

Chunk
Conflicting content 
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
import org.elasticsearch.client.ClusterAdminClient;
<<<<<<< HEAD:src/main/java/org/xbib/elasticsearch/action/river/jdbc/state/put/PutRiverStateRequestBuilder.java
import org.elasticsearch.client.internal.InternalGenericClient;
import org.xbib.elasticsearch.action.river.jdbc.state.RiverState;
=======
import org.xbib.elasticsearch.plugin.jdbc.state.RiverState;
>>>>>>> e13884c0142ffe5e4f755fb6c427e0ca895a9bde:src/main/java/org/xbib/elasticsearch/action/plugin/jdbc/state/put/PutRiverStateRequestBuilder.java

public class PutRiverStateRequestBuilder extends AcknowledgedRequestBuilder {
Solution content 
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
import org.elasticsearch.client.ClusterAdminClient;
import org.elasticsearch.client.internal.InternalGenericClient;
import org.xbib.elasticsearch.plugin.jdbc.state.RiverState;

public class PutRiverStateRequestBuilder extends AcknowledgedRequestBuilder {
File
PutRiverStateRequestBuilder.java
Developer's decision
Combination
Kind of conflict
Import