Problem solved

This commit is contained in:
Guillem Hernandez Sola
2020-10-20 10:25:19 +02:00
parent 122e16c28a
commit 9d76193af1

3
Jenkinsfile vendored
View File

@@ -16,8 +16,6 @@ pipeline {
sh 'mvn test' sh 'mvn test'
} }
} }
<<<<<<< HEAD
=======
stage ('Installing Stage') { stage ('Installing Stage') {
steps { steps {
@@ -25,6 +23,5 @@ pipeline {
} }
} }
>>>>>>> feature-1
} }
} }