lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-05-14 11:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Fix] Clean up merge conflict

Browse source
This commit is contained in:
Fabian Joswig 2025-05-05 19:14:33 +02:00
parent 6d80efd388
commit f594e0632a
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pyerrors/obs.py
View file

@ -1788,7 +1788,6 @@ def import_bootstrap(boots: ndarray, name: str, random_numbers: ndarray) -> Obs:
return ret
<<<<<<< HEAD
def merge_obs(list_of_obs: list[Obs]) -> Obs:
"""Combine all observables in list_of_obs into one new observable.
This allows to merge Obs that have been computed on multiple replica