ref:code refactor

Author: AndVikVin

src/jquery.enjoyhint.js

@@ -1022,11 +1022,7 @@ CanvasRenderingContext2D.prototype.roundRect = function(x, y, w, h, r) {
           });
 
           setTimeout(function(){
-<<<<<<< HEAD
             var summoryButtonWidth = that.$next_btn.width() + that.$skip_btn.width() + 20;
-=======
-            var summoryButtonWidth = that.$next_btn.width() + that.$skip_btn.width() + 10;
->>>>>>> 7335cea66483cc59ae039d8c2b41b881f6b4cfd2
             var distance = label_x;
 
             if (summoryButtonWidth + label_x > arrowFinishX) {
@@ -1035,11 +1031,7 @@ CanvasRenderingContext2D.prototype.roundRect = function(x, y, w, h, r) {
 
             that.$next_btn.css({
               left: distance,
-<<<<<<< HEAD
               top: label_y + label_height + 40
-=======
-              top: label_y + label_height + 20
->>>>>>> 7335cea66483cc59ae039d8c2b41b881f6b4cfd2
             });
 
             var left_skip = distance + that.$next_btn.width() + 10;
@@ -1050,11 +1042,7 @@ CanvasRenderingContext2D.prototype.roundRect = function(x, y, w, h, r) {
 
             that.$skip_btn.css({
               left: left_skip,
-<<<<<<< HEAD
               top: label_y + label_height + 40
-=======
-              top: label_y + label_height + 20
->>>>>>> 7335cea66483cc59ae039d8c2b41b881f6b4cfd2
             });
           }, 0)