From 191d5ceeb35118dda4eaa7918f5443f0726a5a0b Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Sat, 12 Mar 2016 22:53:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=AF=E6=8C=81=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=8C=E6=89=A7=E8=A1=8C=E5=99=A8=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E6=97=A5=E5=BF=97=EF=BC=9B=202=E3=80=81=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BF=9C=E7=A8=8B=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=88=E6=AD=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js     | 4 ----
 .../main/java/com/xxl/job/client/handler/HandlerThread.java   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
index 72cb65a3..2c248806 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
@@ -196,11 +196,7 @@ $(function() {
 		ComConfirm.show("确认主动终止任务?", function(){
 			$.ajax({
 				type : 'POST',
-<<<<<<< HEAD
 				url : base_url + 'joblog/logKill',
-=======
-				url : base_url + 'joblog/ferrariJobKill',
->>>>>>> branch 'master' of https://github.com/xuxueli/xxl-job.git
 				data : {"id":_id},
 				dataType : "json",
 				success : function(data){
diff --git a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
index f8babda0..82412fd9 100644
--- a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
+++ b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
@@ -97,7 +97,7 @@ public class HandlerThread extends Thread{
 					} catch (Exception e) {
 						logger.info("HandlerThread Exception:", e);
 					}
-					logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}", 
+					logger.info(">>>>>>>>>>> xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}", 
 							new Object[]{handlerData, _status, _msg, callback, this});
 				} else {
 					i++;