Skip to content
Snippets Groups Projects
Commit 455c934f authored by Carlo Baffa's avatar Carlo Baffa
Browse files

Recover an unmerged file

parent 91dab01b
No related branches found
No related tags found
No related merge requests found
Pipeline #11366 passed
Stage: test
Stage: linting
Stage: deploy
Stage: .post
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
setup.cfg
+ 0
− 4
View file @ 455c934f
...@@ -18,11 +18,7 @@ addopts = --verbose ...@@ -18,11 +18,7 @@ addopts = --verbose
--cov-report=term --cov-report=term
--cov-report=html --cov-report=html
--cov-report=xml --cov-report=xml
<<<<<<< HEAD
--junitxml=build/reports/unit-tests.xml --junitxml=build/reports/unit-tests.xml
=======
--junitxml=build/reports/csp-lmc-subelement-unit-tests.xml
>>>>>>> 01be27bd23e5ee3a505cb60164fa874fe0efbbc7
junit_family=legacy junit_family=legacy
console_output_style = progress console_output_style = progress
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment