From e648ef56783676d815411741cc60040973d70d1d Mon Sep 17 00:00:00 2001 From: KVKR31 Date: Fri, 4 Aug 2023 14:45:08 +0530 Subject: [PATCH] added --- Jenkinsfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c268b8fb4..d37b5fe6f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,13 +24,8 @@ pipeline { } stage('build') { steps { -<<<<<<< HEAD archiveArtifacts artifacts: '**/target/spring-petclinic-*.jar' junit testResults : '**/target/surefire-reports/TEST-*.xml' -======= - archiveArtifacts artifacts: '**/target/spring-petclinic-*.jar' - junit testResults: '**/target/surefire-reports/TEST-*.xml' ->>>>>>> f531905a03ca63a789b989629593531fb3c7ab7c } } }