Home Explore Help
Sign In
avb
/
scheduleServer
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Обновить 'Jenkins/jenkinsfile'

vmshay 5 years ago
parent
fed3d603e0
commit
efda97f71c
1 changed files with 0 additions and 4 deletions
Unified View Show Diff Stats
  1. 0 4
      Jenkins/jenkinsfile

+ 0 - 4
Jenkins/jenkinsfile
View File 

@@ -36,11 +36,7 @@ pipeline {
 
       }
 
       }
 
       failure {
 
       failure {
 
         echo 'I failed :((('
 
         echo 'I failed :((('
 
-<<<<<<< HEAD
 
         echo GetLog()
 
         echo GetLog()
 
-=======
 
-			sh 'curl "${BUILD_URL}/consoleText" > /tmp/test.txt'
 
->>>>>>> 5518cc11c8ddaf2485f2e6e569815856ea1619fc
 
       }
 
       }
 
       changed {
 
       changed {
 
         echo 'things were different before...'
 
         echo 'things were different before...'