功能修改

src/main/resources/templates/login.html

@@ -122,7 +122,7 @@
 			  	  <div align="center">
 					<div class="subbtn-group">
 					   <a href="javascript:;" id="loginRegister" style="color: #fff;" class="button_login">点击注册</a>
-						<a onclick="severCheck();" href="javascript:;" class="button_login" id="to-recover">登&nbsp;录</a>
+						<a onclick="severCheck();" href="javascript:;" class="button_login" id="to-recover">登录</a>
 						<span class="submitBtn"></span>
 					</div>
 					
@@ -245,11 +245,8 @@
 			//回调ca  GetCertEntity方法，并回调getuser方法
 			GetCertEntity(strServerCert,getUser);
 		}
-<<<<<<< HEAD
-		function severLogin(forceLogin){//alert(forceLogin);
-=======
 		function severLogin(forceLogin){
->>>>>>> 250313bb7ba1ed1d5a94b7230af4715b491743c4
+
 			 
 			if(check()){
 				var loginname = $("#loginname").val();