From 91dab01ba77a00d1419fb373d92ce0afa5a79e40 Mon Sep 17 00:00:00 2001
From: Carlo Baffa <baffa@arcetri.astro.it>
Date: Tue, 7 Apr 2020 16:45:42 +0200
Subject: [PATCH] A small typo in setup.cfg
---
setup.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/setup.cfg b/setup.cfg
index ed35f2e..d21d742 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,11 @@ 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