From 2a445bca671c8ff9115c2db1ef87ca57e2d9328d Mon Sep 17 00:00:00 2001
From: Rehili Ghazwa <ghazwarhili@gmail.com>
Date: Thu, 19 Sep 2024 19:13:58 +0200
Subject: [PATCH] fix resolving conflicts errors

---
 .../equipment/creation/StaticCompensatorCreationEntity.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java
index 1e1aaf8ad..2e0d55800 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/StaticCompensatorCreationEntity.java
@@ -129,6 +129,7 @@ public StaticVarCompensatorCreationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             // Injection