Projects >> jredis >>b95895a5664a889bd4d937066154041b38d8a24f

Chunk
Conflicting content
		public void onEvent(Connection.Event event);
	}
	
<<<<<<< HEAD
=======
	// ========================================================================
	// Innner Types
	// ========================================================================
	
	/**
	 * [TODO: document me!]
	 *
	 * @author  Joubin Houshyar (alphazero@sensesay.net)
	 * @version alpha.0, Mar 29, 2010
	 * @since   alpha.0
	 * 
	 */
	public interface Listener {
		public void onEvent(Connection.Event event);
	}
	
>>>>>>> b59444c5a8fc90ef04926ec0d4c614d9e133c0bd
	/**
	 * [TODO: document me!]
	 *
Solution content
		public void onEvent(Connection.Event event);
	}
	/**
	 * [TODO: document me!]
	 *
File
Connection.java
Developer's decision
Version 1
Kind of conflict
Comment
Interface declaration