Commit c40ddd23 authored by dev_sky's avatar dev_sky
Browse files

fix confilct

parent bdfd55c3

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java

+0 −1
Original line number Diff line number Diff line
@@ -433,7 +433,6 @@ public class UsersController extends BaseController { 
                               @RequestParam(value = "userPassword") String userPassword,

                               @RequestParam(value = "repeatPassword") String repeatPassword,

                               @RequestParam(value = "email") String email) throws Exception {

<<<<<<< HEAD

        String parameterFormat = "[\n|\r|\t]";

        userName = userName.replaceAll(parameterFormat, "");

        userPassword = userPassword.replaceAll(parameterFormat, "");