diff --git a/dsBase/WebRoot/login.html b/dsBase/WebRoot/login.html
index faed0676..c2eb6d0b 100644
--- a/dsBase/WebRoot/login.html
+++ b/dsBase/WebRoot/login.html
@@ -117,13 +117,7 @@
                     async: false,
                     success: function (result) {
                         if (result.success) {
-                            window.location.href = '/dsBase/index.html';
-                        } else {
-                            alert(result.msg);
-                            if (result.redirect) {
-                                window.location.href = '/dsBase/plogin.html';
-                            }
-                            refreshCaptcha();
+                            window.location.href = '/dsWeb/index.html';
                         }
                     }
                 });
diff --git a/nginx/logs/nginx.pid b/nginx/logs/nginx.pid
index d3b87d11..eb5585f0 100644
--- a/nginx/logs/nginx.pid
+++ b/nginx/logs/nginx.pid
@@ -1 +1,5 @@
+<<<<<<< HEAD
+30772
+=======
 32728
+>>>>>>> 34d4ee5cc4e42d310e2f63abecc3a24461cfdcec