From f1243df70af972d5ea37fc589fbb29a54c486170 Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander@mail-schlemmer.de>
Date: Wed, 16 Feb 2022 13:39:27 +0100
Subject: [PATCH] changed name of function

---
 src/caosdb/apiutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py
index f86ea010..0f8a2495 100644
--- a/src/caosdb/apiutils.py
+++ b/src/caosdb/apiutils.py
@@ -712,7 +712,7 @@ def copy_entity(entity: Entity):
     return new
 
 
-def merge_entities_in_place(entity_a: Entity, entity_b: Entity):
+def merge_entities(entity_a: Entity, entity_b: Entity):
     """
     Merge entity_b into entity_a such that they have the same parents and properties.
     """
-- 
GitLab