Projects >> RapidFTR-Android >>f0393163b307dc68ee76bf34d00244370433caa1

Chunk
Conflicting content
        return null;
    }

<<<<<<< HEAD
    @Override
    public boolean equals(Object other) {
        try {
            return (other != null && other instanceof JSONObject) && JSON_MAPPER.readTree(toString()).equals(JSON_MAPPER.readTree(other.toString()));
        } catch (IOException e) {
            return false;
        }
    }


=======
    public List getConfirmedMatchingModels(PotentialMatchRepository potentialMatchRepository, ChildRepository childRepository, EnquiryRepository enquiryRepository) {
        return new ArrayList();
    }

>>>>>>> ba965062cc39062f1f086392ef998654acf72946
    public class History extends JSONObject implements Parcelable {
        public static final String HISTORIES = "histories";
        public static final String USER_NAME = "user_name";
Solution content
        return null;
    }

    @Override
    public boolean equals(Object other) {
        try {
            return (other != null && other instanceof JSONObject) && JSON_MAPPER.readTree(toString()).equals(JSON_MAPPER.readTree(other.toString()));
        } catch (IOException e) {
            return false;
        }
    }

    public List getConfirmedMatchingModels(PotentialMatchRepository potentialMatchRepository, ChildRepository childRepository, EnquiryRepository enquiryRepository) {
        return new ArrayList();
    }

    public class History extends JSONObject implements Parcelable {
        public static final String HISTORIES = "histories";
        public static final String USER_NAME = "user_name";
File
BaseModel.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Method declaration