Remove conflicted files

Signed-off-by: Andrew Carbonetto <[email protected]>
opensearch-project · Jan 21, 2025 · c6c6cc1 · c6c6cc1
1 parent daa95ff
commit c6c6cc1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/DateTimeFunctionTest.java
@@ -1230,8 +1230,6 @@ public void testWeekFormats(
         expectedInteger);
   }
 
-  // subtracting 1 as a temporary fix for year 2024.
-  // Issue: https://github.com/opensearch-project/sql/issues/2477
   @Test
   public void testWeekOfYearWithTimeType() {
     LocalDate today = LocalDate.now(functionProperties.getQueryStartClock());

diff --git a/core/src/test/java/org/opensearch/sql/expression/datetime/YearweekTest.java b/core/src/test/java/org/opensearch/sql/expression/datetime/YearweekTest.java
@@ -99,8 +99,6 @@ public void testYearweekWithoutMode() {
     assertEquals(eval(expression), eval(expressionWithoutMode));
   }
 
-  // subtracting 1 as a temporary fix for year 2024.
-  // Issue: https://github.com/opensearch-project/sql/issues/2477
   @Test
   public void testYearweekWithTimeType() {
     int expected = getYearWeekBeforeSunday(LocalDate.now(functionProperties.getQueryStartClock()));