Projects >> testlink-java-api >>ca1b05e58116d5b8641265c6e5bada826e279d2f

Chunk
Conflicting content
    public String toString() {
        return "TestCase [id=" + id + ", name=" + name + ", testSuiteId=" + testSuiteId + ", testProjectId="
                + testProjectId + ", authorLogin=" + authorLogin + ", summary=" + summary + ", steps=" + steps
<<<<<<< HEAD
                + ", preconditions=" + preconditions + ", testImportance=" + testImportance + ", executionType="
                + executionType + ", executionOrder=" + executionOrder + ", order=" + order + ", internalId="
                + internalId + ", fullExternalId=" + fullExternalId + ", checkDuplicatedName=" + checkDuplicatedName
                + ", actionOnDuplicatedName=" + actionOnDuplicatedName + ", versionId=" + versionId + ", version="
                + version + ", parentId=" + parentId + ", customFields=" + customFields + ", executionStatus="
                + executionStatus + ", platform=" + platform + ", featureId=" + featureId + ", keywords= " + keywords + "]";
=======
                + ", preconditions=" + preconditions + ", testCaseStatus=" + testCaseStatus + ", testImportance="
                + testImportance + ", executionType=" + executionType + ", executionOrder=" + executionOrder
                + ", order=" + order + ", internalId=" + internalId + ", fullExternalId=" + fullExternalId
                + ", checkDuplicatedName=" + checkDuplicatedName + ", actionOnDuplicatedName=" + actionOnDuplicatedName
                + ", versionId=" + versionId + ", version=" + version + ", parentId=" + parentId + ", customFields="
                + customFields + ", executionStatus=" + executionStatus + ", platform=" + platform + ", featureId="
                + featureId + "]";
>>>>>>> 3bd582c8e7475727732ce416e4581db69e619dba
    }

}
Solution content
    public String toString() {
        return "TestCase [id=" + id + ", name=" + name + ", testSuiteId=" + testSuiteId + ", testProjectId="
                + testProjectId + ", authorLogin=" + authorLogin + ", summary=" + summary + ", steps=" + steps
                + ", preconditions=" + preconditions + ", testCaseStatus=" + testCaseStatus + ", testImportance="
                + testImportance + ", executionType=" + executionType + ", executionOrder=" + executionOrder
                + ", order=" + order + ", internalId=" + internalId + ", fullExternalId=" + fullExternalId
                + ", checkDuplicatedName=" + checkDuplicatedName + ", actionOnDuplicatedName=" + actionOnDuplicatedName
                + ", versionId=" + versionId + ", version=" + version + ", parentId=" + parentId + ", customFields="
                + customFields + ", executionStatus=" + executionStatus + ", platform=" + platform + ", featureId="
                + featureId + ", keywords= " + keywords + "]";
    }

}
File
TestCase.java
Developer's decision
Manual
Kind of conflict
Attribute