Projects >> jgltut >>42e2a667d03de5cd801b43409ab5a9bc13f8e5dd

Chunk
Conflicting content 
 * @author integeruser
 */
public class PortingUtils {
<<<<<<< HEAD
		
	public static abstract class BufferableData {		
		
		public abstract T fillBuffer(T buffer);
		
=======
	
	public static abstract class BufferableData {		
		
		public abstract T fillBuffer(T buffer);

>>>>>>> 9511b0d299dda16cdcc1f0b0b1c00aaf805c773d
		public T fillAndFlipBuffer(T buffer) {
			buffer.clear();
			fillBuffer(buffer);
Solution content 
 * @author integeruser
 */
public class PortingUtils {
		
	public static abstract class BufferableData {		
		
		public abstract T fillBuffer(T buffer);
		
		public T fillAndFlipBuffer(T buffer) {
			buffer.clear();
			fillBuffer(buffer);
File
PortingUtils.java
Developer's decision
Version 1
Kind of conflict
Class signature
Method interface