Skip to content

Commit 55c8642

Browse files
committed
fix conflict markers
1 parent 28ac656 commit 55c8642

File tree

1 file changed

+2
-6
lines changed
  • x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string

1 file changed

+2
-6
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLower.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@ public class ToLower extends ChangeCase {
2828
@FunctionInfo(
2929
returnType = { "keyword" },
3030
description = "Returns a new string representing the input string converted to lower case.",
31-
<<<<<<< HEAD
32-
examples = { @Example(file = "string", tag = "to_lower"), @Example(file = "string", tag = "to_lower_mv") }
33-
=======
3431
examples = {
3532
@Example(file = "string", tag = "to_lower"),
36-
@Example(file = "string", tag = "to_lower_mv", applies_to = "stack: ga 9.1") }
37-
>>>>>>> d836aa8538b24a7906b4db3939b6ff183b43e90a
38-
)
33+
@Example(file = "string", tag = "to_lower_mv")}
34+
)
3935

4036
public ToLower(Source source, @Param(
4137
name = "str",

0 commit comments

Comments
 (0)