Projects >> Synapse-Repository-Services >>5162418b811a1df9ab118e3142454cd16ad4ecfc

Chunk
Conflicting content
	public void setFileHandleManager(FileHandleManager fileHandleManager) {
		this.fileHandleManager = fileHandleManager;
	}
<<<<<<< HEAD
=======

	@Override
	public void afterPropertiesSet() throws Exception {
		UserGroup authUsers = userGroupDAO.findGroup(DEFAULT_GROUPS.AUTHENTICATED_USERS.name(), false);
		if (authUsers == null) {
			throw new DatastoreException("Could not find the default group for all authenticated users");
		}
		authenticatedUsersId = authUsers.getId();
	}
>>>>>>> fcbca0ccf6005fb6090de50bfb15f32660fd56a6
	
	@Override
	public MessageToUser getMessage(UserInfo userInfo, String messageId) throws NotFoundException {
Solution content
	public void setFileHandleManager(FileHandleManager fileHandleManager) {
		this.fileHandleManager = fileHandleManager;
	}
	
	@Override
	public MessageToUser getMessage(UserInfo userInfo, String messageId) throws NotFoundException {
File
MessageManagerImpl.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration