Skip to content
Snippets Groups Projects
Commit 3abbd003 authored by Soeren Peters's avatar Soeren Peters
Browse files

Fix merge conflict.

parent c2af5e1d
No related branches found
No related tags found
1 merge request!21Update CMake and VF CPU code.
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
.gitlab-ci.yml
+ 0
− 4
View file @ 3abbd003
......@@ -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 ##
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment