Projects >> mifosx >>84db0f979450dd19453448b8287e844bdb8e817a

Chunk
Conflicting content 

	private final String entityType = "CODE";
<<<<<<< HEAD
    @Autowired
    private PlatformSecurityContext context;
	
=======
	private final PlatformSecurityContext context;

	@Autowired
	public CodesApiResource(final PlatformSecurityContext context) {
		this.context = context;
	}


>>>>>>> 51f661de17a359be5ef300d66762055322a97dd7
	@GET
	@Consumes({MediaType.APPLICATION_JSON})
	@Produces({MediaType.APPLICATION_JSON})
Solution content 
	private final String entityType = "CODE";
	private final PlatformSecurityContext context;

	@Autowired
	public CodesApiResource(final PlatformSecurityContext context) {
		this.context = context;
	}

	@GET
	@Consumes({MediaType.APPLICATION_JSON})
	@Produces({MediaType.APPLICATION_JSON})
File
CodesApiResource.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Method declaration