Projects >> ECE1770-DEBS-Challenge >>f5e1a7b4d63cc4d5e0b5ba307477e5e87cd4abab

Chunk
Conflicting content
public class CSimpleServerManufacturing extends SimpleChannelHandler {

//	private long i = 0;
<<<<<<< HEAD
	private long modulo = 1L, time = 0L;
	private int count = 0;
	private long latency = 0L;
=======
//	private long modulo = �1;
>>>>>>> 985173b9ac909db5a7d4c8b6e9661b6d08a0d7e9
	private Query1 q1;
	private Query2 q2;
	
Solution content
public class CSimpleServerManufacturing extends SimpleChannelHandler {

	private long modulo = 1L, time = 0L;
	private int count = 0;
	private long latency = 0L;

	private Query1 q1;
	private Query2 q2;
	
File
CSimpleServerManufacturing.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment