Skip to content

Commit d812821

Browse files
committed
fix transport versions merge
1 parent fd61d59 commit d812821

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,8 @@ static TransportVersion def(int id) {
300300
public static final TransportVersion NONE_CHUNKING_STRATEGY = def(9_097_0_00);
301301
public static final TransportVersion PROJECT_DELETION_GLOBAL_BLOCK = def(9_098_0_00);
302302
public static final TransportVersion SECURITY_CLOUD_API_KEY_REALM_AND_TYPE = def(9_099_0_00);
303-
<<<<<<< markjhoy/add_sparse_vector_token_pruning_index_options
304-
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_100_0_00);
305-
=======
306303
public static final TransportVersion STATE_PARAM_GET_SNAPSHOT = def(9_100_0_00);
307-
>>>>>>> main
304+
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_101_0_00);
308305

309306
/*
310307
* STOP! READ THIS FIRST! No, really,

0 commit comments

Comments
 (0)