From ed0e623930a2dbddc35b57ecbd16c4f49ec5b7ae Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Thu, 5 Aug 2021 16:05:41 +0200
Subject: [PATCH] EN-0001 - add new stages

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 09907e9..61b83cc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,6 @@ pipeline {
         }
       }
 
-<<<<<<< HEAD
       stage('SonarScan') { 
          steps {
              sh '''
@@ -106,8 +105,6 @@ pipeline {
         }
       }
 
-=======
->>>>>>> fff4fbb07cecdaeee187b4566e948ac1794dc6e8
       stage('update repo') {
         steps {
           sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {