fix

src/org/qg/docker/StageBucket.groovy

@@ -86,10 +86,6 @@ def checkout_lua_ui(branchName, gitRepo) {
 
         t1.size().times {
             dir (projects[it]) {
-<<<<<<< HEAD
-                sh "\\config_repositoryp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
-                sh "chmod +x .git/hooks/post-merge"
-=======
                 def folder = new File( '.git/hooks/' )
 
                 if( !folder.exists() ) {
@@ -102,10 +98,8 @@ def checkout_lua_ui(branchName, gitRepo) {
                     }
                     sh "npm install"
                 }else{
-                    sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
+                    sh "\\cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
                     sh "chmod +x .git/hooks/post-merge"
->>>>>>> 9a70561f7a998386aa5fce9e043c1a9747007410
-                
                     git branch: branches[it], credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: "git@git.quantgroup.cn:${groups[it]}/${projects[it]}.git"
                 }
             }