From f7db1d6612c1344e6388a0db3ffdf22ab01ed948 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 23 Jan 2023 17:03:41 +0200
Subject: [PATCH] Revert deprecated enum

---
 .../server/common/data/edge/EdgeEventActionType.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
index 9d3912ec8b..b13dfb89c9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
@@ -33,5 +33,6 @@ public enum EdgeEventActionType {
     ALARM_CLEAR,
     ASSIGNED_TO_EDGE,
     UNASSIGNED_FROM_EDGE,
-    CREDENTIALS_REQUEST
+    CREDENTIALS_REQUEST,
+    ENTITY_MERGE_REQUEST // DEPRECATED
 }
\ No newline at end of file