Projects >> atlas-persistence >>fadcf5bb03ee9f58cb4fae7d90e3a70f2d1b37d6

Chunk
Conflicting content 
        return contentIterator(BRAND_SERIES_AND_ITEMS_TABLES, new ListingCursorBuilder() {
            @Override
            public DBCursor cursorFor(ContentCategory category) {
<<<<<<< HEAD
                return cursorFor(category, queryCriteria());
            }
            
            @Override
            public DBCursor cursorForGreaterThan(ContentCategory category, Content greaterThan) {
            	return cursorFor(category, queryCriteria().fieldGreaterThan(ID, greaterThan.getCanonicalUri()));
=======
                return contentTables.collectionFor(category).find(where().fieldEquals("topics.topic", topicId).build()).sort(sort().ascending(ID).build());
>>>>>>> 3bd84e6b856b88ca86eb0cb21550b9914f7c13a7
            }

            private DBCursor cursorFor(ContentCategory category, MongoQueryBuilder query) {
Solution content 
        return contentIterator(BRAND_SERIES_AND_ITEMS_TABLES, new ListingCursorBuilder() {
            @Override
            public DBCursor cursorFor(ContentCategory category) {
                return cursorFor(category, queryCriteria());
            }
            
            @Override
            public DBCursor cursorForGreaterThan(ContentCategory category, Content greaterThan) {
            	return cursorFor(category, queryCriteria().fieldGreaterThan(ID, greaterThan.getCanonicalUri()));
            }

            private DBCursor cursorFor(ContentCategory category, MongoQueryBuilder query) {
File
MongoContentLister.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Method signature
Return statement