Revert deprecated enum

4 years ago · f7db1d6612
1 changed files with 2 additions and 1 deletions
--- 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
 }