Projects >> jdbi >>c1e55361cfe89b3ad03f429651694c94fad015fa

Chunk
Conflicting content
        afterExecution(stmt);

<<<<<<< HEAD:core/src/main/java/org/jdbi/v3/SQLStatement.java
        return stmt;
=======
        try {
            return munger.munge(stmt);
        }
        catch (SQLException e) {
            try {
                stmt.close();
            } catch (SQLException e1) {
                e1.printStackTrace(); // TODO: ditto above
            }
            throw new ResultSetException("Exception thrown while attempting to traverse the result set", e, getContext());
        }
    }

    protected SQLLog getLog()
    {
        return log;
>>>>>>> ef993698927a92ec3844a39e86dcca92b956c169:src/main/java/org/skife/jdbi/v2/SQLStatement.java
    }

    protected TimingCollector getTimingCollector()
Solution content
        afterExecution(stmt);

        return stmt;
    }


    protected TimingCollector getTimingCollector()
File
SQLStatement.java
Developer's decision
Combination
Kind of conflict
Attribute
Method signature
Return statement
Try statement