Projects >> Synapse-Repository-Services >>a183666a90c67d07a0746cf0bcd2f1c3f0a7be2f

Chunk
Conflicting content 
	private WorkerLogger workerLogger;

	@Override
<<<<<<< HEAD
	public void run(ProgressCallback progressCallback, ChangeMessage change)
=======
	public void run(final ProgressCallback progressCallback, final Message message)
>>>>>>> a32b32e6d5f6304113e84baecdd74b13a2437efb
			throws RecoverableMessageException, Exception {
		// We only care about MESSAGE messages here
		if (ObjectType.MESSAGE == change.getObjectType()) {
Solution content 
	private WorkerLogger workerLogger;

	@Override
	public void run(final ProgressCallback progressCallback, final ChangeMessage change)
			throws RecoverableMessageException, Exception {
		// We only care about MESSAGE messages here
		if (ObjectType.MESSAGE == change.getObjectType()) {
File
MessageToUserWorker.java
Developer's decision
Manual
Kind of conflict
Method signature