From 842ba3d93f840c94bdfc965fc43ed6e0ae8efd99 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 25 Feb 2021 14:04:36 +0100
Subject: [PATCH] fix merge conflicts
---
src/main/java/org/caosdb/server/entity/UpdateEntity.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/caosdb/server/entity/UpdateEntity.java b/src/main/java/org/caosdb/server/entity/UpdateEntity.java
index 1f4c3026..884632b5 100644
--- a/src/main/java/org/caosdb/server/entity/UpdateEntity.java
+++ b/src/main/java/org/caosdb/server/entity/UpdateEntity.java
@@ -22,13 +22,13 @@
*/
package org.caosdb.server.entity;
-import org.caosdb.server.transaction.Update;
+import org.caosdb.server.transaction.WriteTransaction;
import org.caosdb.server.utils.EntityStatus;
import org.jdom2.Element;
/**
* UpdateEntity class represents entities which are to be updated. The previous version is appeded
- * during the {@link Update} transactions initialization.
+ * during the {@link WriteTransaction} transactions initialization.
*
* @author Timm Fitschen (t.fitschen@indiscale.com)
*/
--
GitLab