Projects >> sensei >>b7d5e652ad7a2052ad49b191149b5bea8e4584a2

Chunk
Conflicting content 
import com.browseengine.bobo.api.FacetSpec;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.lucene.search.SortField;
<<<<<<< HEAD
import org.json.JSONObject;
import org.springframework.remoting.RemoteConnectFailureException;
import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;
=======
>>>>>>> 5561bada84d0abc8e969fb6711be46de95a53be1

import com.browseengine.bobo.api.BrowseSelection;
Solution content 
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.lucene.search.SortField;
import org.json.JSONObject;
import org.springframework.remoting.RemoteConnectFailureException;
import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;

import com.browseengine.bobo.api.BrowseSelection;
import com.browseengine.bobo.api.FacetSpec;
File
SenseiClusterClient.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.browseengine.bobo.api.FacetSpec;
import com.browseengine.bobo.api.FacetSpec.FacetSortSpec;
import com.linkedin.norbert.NorbertException;
<<<<<<< HEAD
import com.sensei.search.req.SenseiJSONQuery;
import com.sensei.search.req.SenseiQuery;
=======
>>>>>>> 5561bada84d0abc8e969fb6711be46de95a53be1
import com.sensei.search.req.SenseiRequest;
import com.sensei.search.req.SenseiResult;
import com.sensei.search.req.SenseiSystemInfo;
Solution content 
import com.browseengine.bobo.api.FacetSpec;
import com.browseengine.bobo.api.FacetSpec.FacetSortSpec;
import com.linkedin.norbert.NorbertException;
import com.sensei.search.req.SenseiJSONQuery;
import com.sensei.search.req.SenseiQuery;
import com.sensei.search.req.SenseiRequest;
import com.sensei.search.req.SenseiResult;
import com.sensei.search.req.SenseiSystemInfo;
File
SenseiClusterClient.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package com.sensei.search.req;

import java.io.Serializable;
<<<<<<< HEAD
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedHashMap;
=======
import java.util.Comparator;
>>>>>>> 5561bada84d0abc8e969fb6711be46de95a53be1
import java.util.List;
import java.util.Map;
import java.util.Set;
Solution content 
package com.sensei.search.req;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Set;
File
SenseiSystemInfo.java
Developer's decision
Concatenation
Kind of conflict
Import