Merge branch 'master' into introduce_hac_clustering

This commit is contained in:
Martha Frysztacki 2021-12-10 17:55:43 +01:00 committed by GitHub
commit 47b90682c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: : 2021 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0
.snakemake .snakemake
.git .git
.pytest_cache .pytest_cache

View File

@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: : 2021 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC0-1.0
.snakemake .snakemake
.git .git
.pytest_cache .pytest_cache
@ -11,9 +15,9 @@ __pycache__
notebooks notebooks
benchmarks benchmarks
logs logs
resources resources*
results results
networks networks*
cutouts cutouts
data/bundle data/bundle
doc doc