Merge remote-tracking branch 'origin/main' into Dejan_local

# Conflicts: # .gitmodules # src/general/load_data.py
IPMI-ICNS-UKE · Dec 7, 2023 · 1398be4 · 1398be4
2 parents 06f81e4 + c818aa2
commit 1398be4
Show file tree

Hide file tree

Showing 31 changed files with 205 additions and 1,242 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/TDEntropyDeconvolution"]
 	path = src/TDEntropyDeconvolution
-	url = https://github.com/IPMI-ICNS-UKE/TDEntropyDeconvolution
+	url = https://github.com/IPMI-ICNS-UKE/TDEntropyDeconvolution
diff --git a/TDE/deconvolution.py b/TDE/deconvolution.py