| Chunk |
|---|
| Conflicting content |
|---|
@Resource
private CandidateSessionDao candidateSessionDao;
<<<<<<< HEAD
//-------------------------------------------------
=======
@Resource
private RequestTimestampContext requestTimestampContext;
>>>>>>> 20abdd06da98190cca8464b8484918a2c6b4dd3e
public CandidateSession lookupCandidateSession(final long xid)
throws DomainEntityNotFoundException, PrivilegeException { |
| Solution content |
|---|
@Resource
private CandidateSessionDao candidateSessionDao;
@Resource
private RequestTimestampContext requestTimestampContext;
public CandidateSession lookupCandidateSession(final long xid)
throws DomainEntityNotFoundException, PrivilegeException { |
| File |
|---|
| AssessmentProctoringService.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Comment |