Upated readme for 1.6.2

README.md

@@ -23,15 +23,18 @@ https://github.com/cowgp/xui-touchSwipe
 
 ### Version History
 
-
+* **1.6.2**	*2013-03-23*
+    - Added support for events binding with on / off / bind in jQ for all callback names.
+    - Deprecated the 'click' handler in favour of tap.
+    - added cancelThreshold property
+* **1.6.1** *2013-02-12*    
+    - Added support for ie8 touch events
 * **1.6.0** *2013-01-12*
  	- Fixed bugs with pinching, mainly when both pinch and swipe enabled, as well as adding time threshold for multifinger gestures, so releasing one finger beofre the other doesnt trigger as single finger gesture.
 	- made the demo site all static local HTML pages so they can be run locally by a developer
 	- added jsDoc comments and added documentation for the plugin	
 	- code tidy
 	- added triggerOnTouchLeave property that will end the event when the user swipes off the element.
-
-
 * **1.5.1** *2012-11-22*	
 	- Fixed bug with jQuery 1.8 and trailing comma in excludedElements
 	- Fixed bug with IE and event.preventDefault();

jquery.touchSwipe.js

@@ -69,17 +69,12 @@
 *					- added jsDoc comments and added documentation for the plugin	
 *					- code tidy
 *					- added triggerOnTouchLeave property that will end the event when the user swipes off the element.
-<<<<<<< HEAD
+* $Date: 2013-03-23 (Sat, 23 Mar 2013) $
 * $version: 1.6.1	- Added support for ie8 touch events
 * $version: 1.6.2	- Added support for events binding with on / off / bind in jQ for all callback names.
 *                   - Deprecated the 'click' handler in favour of tap.
-=======
-* $version: 1.6.1	- Added support for ie8
-* $Date: 2013-03-23 (Sat, 23 Mar 2013) $
-* $version: 1.6.2	- more IE8 fixes
-                    - added events as well as callbacks, so all callbacks can be used with on/bind etc
-                    - added cancelThreshold property
->>>>>>> master
+*                    - added cancelThreshold property
+*
 */
 
 /**