From 3abbd0037c02de9b076f010535ee524106dd3c22 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters.soeren@gmx.net>
Date: Mon, 15 Feb 2021 14:23:15 +0100
Subject: [PATCH] Fix merge conflict.
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c9455d6b..b84d22038 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -445,11 +445,7 @@ sonar-scanner:
script:
- cd $CI_PROJECT_DIR
-<<<<<<< HEAD
- - sonar-scanner -X -Dsonar.verbose=true -Dsonar.login=$SONAR_SECURITY_TOKEN
-=======
- sonar-scanner -Dsonar.login=$SONAR_SECURITY_TOKEN
->>>>>>> open_source
###############################################################################
## Release ##
--
GitLab