Projects >> factual-java-driver >>5823b01d24b5dd3a2a1f05e966c3b129ef8b1618

Chunk
Conflicting content
 */
 * @author aaron
public class Factual {
<<<<<<< HEAD
  private static final String DRIVER_HEADER_TAG = "factual-java-driver-v1.4.3-android";
=======
  private static final String DRIVER_HEADER_TAG = "factual-java-driver-v1.5.0";
>>>>>>> 7c03dd069e034018890dc9f1088fa8fcbdc47974
  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.5.0-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