fix merge

Signed-off-by: BOUHOURS Antoine <[email protected]>
gridsuite · Nov 2, 2023 · b74aa34 · b74aa34
1 parent ba8e65e
commit b74aa34
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 826 deletions.
diff --git a/src/main/java/org/gridsuite/filter/server/ExpertFilterRepositoryProxy.java b/src/main/java/org/gridsuite/filter/server/ExpertFilterRepositoryProxy.java
diff --git a/src/main/java/org/gridsuite/filter/server/dto/ExpertFilter.java b/src/main/java/org/gridsuite/filter/server/dto/ExpertFilter.java
diff --git a/src/main/java/org/gridsuite/filter/server/dto/expertrule/AbstractExpertRule.java b/src/main/java/org/gridsuite/filter/server/dto/expertrule/AbstractExpertRule.java
diff --git a/src/main/java/org/gridsuite/filter/server/dto/expertrule/BooleanExpertRule.java b/src/main/java/org/gridsuite/filter/server/dto/expertrule/BooleanExpertRule.java