Problem solved

2020-10-20 10:25:19 +02:00
parent 122e16c28a
commit 9d76193af1
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@@ -16,8 +16,6 @@ pipeline {
                    sh 'mvn test'
            }
        }
-<<<<<<< HEAD
-=======

        stage ('Installing Stage') {
            steps {
@@ -25,6 +23,5 @@ pipeline {
            }
        }
        
->>>>>>> feature-1
    }
 }