20191129 解决冲突

1 job for <span class="ref-name">dev-20191126-app-account</span> in 0 second (queued for 1 second)
状态 作业 ID 名称 覆盖率
  Test
已失败 #17984
pica
sonar_analyze

00:00:00

 
名称 暂存 失败
已失败
sonar_analyze Test There is an unknown failure, please try again
Running on gitlab.example.com...
Fetching changes...
HEAD is now at e1c1ff6 20191128 去掉加密
From http://192.168.110.53/com.pica.cloud.account/pica-cloud-account
952a6f4..e1c741b dev-20191126-app-account -> origin/dev-20191126-app-account
Checking out e1c741b5 as dev-20191126-app-account...
$ ./sonar_analyze.sh
bash: line 43: ./sonar_analyze.sh: Permission denied
ERROR: Build failed: exit status 1