Fix merge conflict

Signed-off-by: Simeon Widdis <[email protected]>
opensearch-project · Nov 6, 2024 · 91509c7 · 91509c7
1 parent ee31eea
commit 91509c7
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...l/src/test/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatterTest.java b/...l/src/test/java/org/opensearch/sql/protocol/response/format/CsvResponseFormatterTest.java
@@ -108,17 +108,12 @@ void quoteIfRequired() {
     QueryResult response =
         new QueryResult(
             schema,
-<<<<<<< HEAD
-            Arrays.asList(tupleValue(ImmutableMap.of("na,me", "John,Smith", ",,age", "30,,,"))));
-    String expected = "\"na,me\",\",,age\"%n" + "\"John,Smith\",\"30,,,\"";
-=======
             Arrays.asList(
                 tupleValue(ImmutableMap.of("na,me", "John,Smith", ",,age", "30,,,")),
                 tupleValue(ImmutableMap.of("na,me", "\"Janice Jones", ",,age", "26\""))));
     String expected =
         "\"na,me\",\",,age\"%n\"John,Smith\",\"30,,,\"%n\"\"\"Janice Jones\",\"26\"\"\"";
->>>>>>> cfe38d7d6 (Fix: CSV and Raw output, escape quotes (#3063))
-    assertEquals(format(expected), formatter.format(response));
+   assertEquals(format(expected), formatter.format(response));
   }
 
   @Test