[incubator-kie-issues#1743] Fix merge conflicts

apache · Jan 20, 2025 · 97ab953 · 97ab953
1 parent bde2e16
commit 97ab953
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/impl/RangeImpl.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/impl/RangeImpl.java
@@ -100,7 +100,6 @@ public boolean isWithUndefined() {
         return withUndefined;
     }
 
-    private Boolean finiteRangeIncludes(FEELDialect feelDialect, Object param) {
     @Override
     public Comparable getStart() {
         if(lowEndPoint instanceof BigDecimal) {
@@ -129,7 +128,7 @@ public Comparable getEnd() {
         return highEndPoint;
     }
 
-    private Boolean finiteRangeIncludes(Object param) {
+    private Boolean finiteRangeIncludes(FEELDialect feelDialect, Object param) {
         if (lowBoundary == RangeBoundary.OPEN && highBoundary == RangeBoundary.OPEN) {
             return bothOrThrow(compare(feelDialect, lowEndPoint, param, (l, r) -> l.compareTo(r) < 0) , compare(feelDialect, highEndPoint, param,  (l, r) -> l.compareTo(r) > 0), param);
         } else if (lowBoundary == RangeBoundary.OPEN && highBoundary == RangeBoundary.CLOSED) {