Projects >> qi4j-sdk >>666fe94881d7d66dfb6f54098afefd77389f956e

Chunk
Conflicting content 
    {
        UnitOfWork uow = uowf.currentUnitOfWork();
        QueryBuilder qb = qbf.newQueryBuilder( typeToList() );
<<<<<<< HEAD
        results = qb.newQuery(uow);
=======
        results = qb.newQuery( uow );
>>>>>>> 3294582eb72d26da76fb093486a58c3907880159
    }

    private Class typeToList()
Solution content 
    {
        UnitOfWork uow = uowf.currentUnitOfWork();
        QueryBuilder qb = qbf.newQueryBuilder( typeToList() );
        results = qb.newQuery( uow );
    }

    private Class typeToList()
File
ProvidesListOfMixin.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation