Permalink
Browse files

Removed conflict marker

  • Loading branch information...
1 parent faa2ebd commit a64a509410a742390bb60bc2bd5c9d9faed3e193 @oschrenk oschrenk committed Dec 24, 2010
Showing with 0 additions and 5 deletions.
  1. +0 −5 README.rdoc
View
@@ -134,18 +134,13 @@ Double-tapping:
Swiping (e.g. "delete" button when swiping over a list entry):
$('some selector').swipe(function(){ ... });
-<<<<<<< HEAD
-=======
Swiping left:
$('some selector').swipeLeft(function(){ ... });
Swiping right:
$('some selector').swipeRight(function(){ ... });
-= Ajax:
->>>>>>> 1182eedd3d59aec75b173b8723428439382b1cfe
-
= Ajax
Simple GET and POST:

0 comments on commit a64a509

Please sign in to comment.