Projects >> qtiworks >>15b7ac13ee6e891bffdd680e361fc19fec365491

Chunk
Conflicting content
            testSessionState.setCurrentItemKey(null);
            return null;
        }
<<<<<<< HEAD
=======
        testSessionState.setCurrentItemKey(itemRefNode.getKey());

        /* Mark item as being presented
         * FIXME: Is this the right place, or should it go in engine service layer?
         */
        final ItemSessionController itemSessionController = getItemSessionController(itemRefNode);
        itemSessionController.markPresented();

        return itemRefNode;
>>>>>>> 925ff3a4cc1cb43598fd9f776d7115226c2a3beb
    }

    /**
Solution content
            testSessionState.setCurrentItemKey(null);
            return null;
        }
    }

    /**
File
TestSessionController.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Return statement
Variable