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