Merge remote-tracking branch 'origin/master'

# Conflicts:
#	unittests/test_doe_idf.py
This commit is contained in:
Guille Gutierrez 2021-11-11 11:51:22 -05:00
commit b7de8ad53a

View File

@ -2,7 +2,6 @@
Building test Building test
SPDX - License - Identifier: LGPL - 3.0 - or -later SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca Copyright © 2020 Project Author Guille Gutierrez Morote Guillermo.GutierrezMorote@concordia.ca
this is my change
""" """
from pathlib import Path from pathlib import Path
from unittest import TestCase from unittest import TestCase