Commit 455c934f authored by Carlo Baffa's avatar Carlo Baffa
Browse files

Recover an unmerged file

parent 91dab01b

setup.cfg

+0 −4
Original line number Original line Diff line number Diff line
@@ -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