From 455c934fc115d3ca0e605bbe8db2e928fff8a373 Mon Sep 17 00:00:00 2001
From: Carlo Baffa <baffa@arcetri.astro.it>
Date: Tue, 7 Apr 2020 16:49:37 +0200
Subject: [PATCH] Recover an unmerged file
---
setup.cfg | 4 ----
1 file changed, 4 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index d21d742..3fd6693 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,11 +18,7 @@ addopts = --verbose
--cov-report=term
--cov-report=html
--cov-report=xml
-<<<<<<< HEAD
--junitxml=build/reports/unit-tests.xml
-=======
- --junitxml=build/reports/csp-lmc-subelement-unit-tests.xml
->>>>>>> 01be27bd23e5ee3a505cb60164fa874fe0efbbc7
junit_family=legacy
console_output_style = progress
--
GitLab