From f594e0632a90bc59682bf43da9a4ebf986a046c4 Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Mon, 5 May 2025 19:14:33 +0200 Subject: [PATCH] [Fix] Clean up merge conflict --- pyerrors/obs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyerrors/obs.py b/pyerrors/obs.py index e76ae597..ccf0cc58 100644 --- a/pyerrors/obs.py +++ b/pyerrors/obs.py @@ -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