diff --git a/Mobile12306New/js/remind.js b/Mobile12306New/js/remind.js
index 3b66ae8..27eabc7 100644
--- a/Mobile12306New/js/remind.js
+++ b/Mobile12306New/js/remind.js
@@ -5,12 +5,7 @@ var Remind = {
 		if ($('#remind_page').length == 0) {
 			return false;
 		}
-<<<<<<< HEAD
 
-
-=======
-		
->>>>>>> 407a9bc0ba6ec59567400d518917d997f74a046f
 		Remind.deviceInfo = JSON.parse(bootStrap.device_info);
 /* 		Remind.deviceInfo = {
 		'did':'020000000000|FFFFFFFF8C61465AA89F4FA78D8767DC0B7F531C',
@@ -22,7 +17,7 @@ var Remind = {
 			});
 			return ;
 		}
-		
+
 		$('#menu_btn').on('click', function() {
 			$('#user_menu').toggle();
 			$('#user_menu').height(document.documentElement.clientHeight-45);
@@ -31,7 +26,7 @@ var Remind = {
 			if ($(e.target).attr('id') == 'user_menu') {
 				$('#user_menu').hide();
 			}
-		});		
+		});
 
 		Public.checkLogin(Remind.hasLogin, Remind.noLogin, Remind.noLogin);
 
@@ -66,10 +61,7 @@ var Remind = {
 		if(!!sch['to'] && CheckStaion.CodeObj[sch['to']]){
 			Remind.endCallback(CheckStaion.CodeObj[sch['to']][1],CheckStaion.CodeObj[sch['to']][2]);
 		}
-<<<<<<< HEAD
 
-=======
-		
 		$('#login').on('click', function() {
 			if ($(this).attr('data-fn') == 'loginout') {
 				cn12306.loginOut(function() {
@@ -81,9 +73,8 @@ var Remind = {
 					Public.toast('退出失败，请重试。');
 				});
 			}
-		});		
-		
->>>>>>> 407a9bc0ba6ec59567400d518917d997f74a046f
+		});
+
 	},
 	hasLogin: function() {
 		$('#login').attr('href', 'javascript:;').attr('data-fn', 'loginout').html('退出');
@@ -208,7 +199,7 @@ var Remind = {
 			Remind.checkType(Remind.trainsHis[key]);
 			return;
 		}
-		Public.showLoading('正在查询数据');
+		Public.showLoading('正在查询数据')
 		cn12306.queryTicket(data,function(json) {
 			if (json["status"] == true && json["httpstatus"] == 200) {
 				if (json['data'].length > 0) {
@@ -216,11 +207,8 @@ var Remind = {
 					Remind.checkType(json['data']);
 					Public.hideLoading();
 				}else{
-<<<<<<< HEAD
-					Public.hideLoading();
-=======
 					Remind.checkType([]);
->>>>>>> 407a9bc0ba6ec59567400d518917d997f74a046f
+					Public.hideLoading();
 					Public.alert('没有找到从<strong>'+$('#startStationName').val()+'</strong>到<strong>'+$('#endStationName').val()+'</strong>的列车');
 				}
 			}