From dc40fbfe04587d097e0a8a43ce1937b4a6f0ea2b Mon Sep 17 00:00:00 2001
From: Guillem Hernandez Sola <guillem@itnove.com>
Date: Tue, 20 Oct 2020 10:22:38 +0200
Subject: [PATCH 1/2] New Jenkinsfile

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 525b69a..27aaaf8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,6 @@ pipeline {
     agent any
 
     tools {
-        // Install the Maven version configured as "M3" and add it to the path.
         maven "maven_jenkins"
     }
 
@@ -17,10 +16,12 @@ pipeline {
                     sh 'mvn test'
             }
         }
+
         stage ('Installing Stage') {
             steps {
                     sh 'mvn install'
             }
         }
+        
     }
 }
\ No newline at end of file

From 9d76193af102b2f3919a06262f71d52392c9acbb Mon Sep 17 00:00:00 2001
From: Guillem Hernandez Sola <guillem@itnove.com>
Date: Tue, 20 Oct 2020 10:25:19 +0200
Subject: [PATCH 2/2] Problem solved

---
 Jenkinsfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f0d5f6c..27aaaf8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,8 +16,6 @@ pipeline {
                     sh 'mvn test'
             }
         }
-<<<<<<< HEAD
-=======
 
         stage ('Installing Stage') {
             steps {
@@ -25,6 +23,5 @@ pipeline {
             }
         }
         
->>>>>>> feature-1
     }
 }
\ No newline at end of file