Projects >> thucydides >>f96fb67fbec6d00de0d3ad7743b0b74ba19fe908

Chunk
Conflicting content 
        return totalSteps * rowsWithResult / totalRows;
    }

<<<<<<< HEAD
    public Optional getTagValue(String tagType) {
        for(TestTag tag : getTags()) {
            if (tag.getType().equalsIgnoreCase(tagType)) {
                return Optional.of(tag.getName());
            }
        }
        return Optional.absent();
=======
    public boolean hasIssue(String issue) {
        return getIssues().contains(issue);
    }

    public boolean hasTag(TestTag tag) {
        return getTags().contains(tag);
>>>>>>> 4c07eb7dead096eb6aaff87ba5d783eafcc0352f
    }

    private static class ExtractTestResultsConverter implements Converter {
Solution content 
        return totalSteps * rowsWithResult / totalRows;
    }

    public Optional getTagValue(String tagType) {
        for(TestTag tag : getTags()) {
            if (tag.getType().equalsIgnoreCase(tagType)) {
                return Optional.of(tag.getName());
            }
        }
        return Optional.absent();
    }

    public boolean hasIssue(String issue) {
        return getIssues().contains(issue);
    }

    public boolean hasTag(TestTag tag) {
        return getTags().contains(tag);
    }

    private static class ExtractTestResultsConverter implements Converter {
File
TestOutcome.java
Developer's decision
Concatenation
Kind of conflict
For statement
Method declaration
Method invocation
Method signature
Return statement