Projects >> factual-java-driver >>a80501fc0cd5619f2057304c748aeb8dde4ca2b3

Chunk
Conflicting content
 * @author aaron
 */
public class Factual {
<<<<<<< HEAD
  private static final String DRIVER_HEADER_TAG = "factual-java-driver-v1.7.0-android";
=======
  private static final String DRIVER_HEADER_TAG = "factual-java-driver-v1.7.2";
>>>>>>> 3c8b4720278aacaedc4550be55bc48a1d91d3456
  private static final String DEFAULT_HOST_HEADER = "api.v3.factual.com";
  private String factHome = "http://api.v3.factual.com/";
  private String host = DEFAULT_HOST_HEADER;
Solution content
 * @author aaron
 */
public class Factual {
  private static final String DRIVER_HEADER_TAG = "factual-java-driver-v1.7.2-android";
  private static final String DEFAULT_HOST_HEADER = "api.v3.factual.com";
  private String factHome = "http://api.v3.factual.com/";
  private String host = DEFAULT_HOST_HEADER;
File
Factual.java
Developer's decision
Manual
Kind of conflict
Attribute