5 năm trước cách đây · efda97f71c
--- a/Jenkins/jenkinsfile
+++ b/Jenkins/jenkinsfile
@@ -36,11 +36,7 @@ pipeline {
 
				       }
			
 
				       failure {
			
 
				         echo 'I failed :((('
			
 
				-<<<<<<< HEAD
			
 
				         echo GetLog()
			
 
				-=======
			
 
				-			sh 'curl "${BUILD_URL}/consoleText" > /tmp/test.txt'
			
 
				->>>>>>> 5518cc11c8ddaf2485f2e6e569815856ea1619fc
			
 
				       }
			
 
				       changed {
			
 
				         echo 'things were different before...'