Fix merge

carlosdelest · Apr 9, 2024 · c0960fa · c0960fa
1 parent 3e847f4
commit c0960fa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/...rence/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java b/...rence/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
@@ -62,7 +62,6 @@
 
 /**
  * A {@link FieldMapper} for semantic text fields.
- *
  */
 public class SemanticTextFieldMapper extends FieldMapper implements InferenceFieldMapper {
     public static final String CONTENT_TYPE = "semantic_text";

diff --git a/.../src/test/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapperTests.java b/.../src/test/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapperTests.java
@@ -71,7 +71,6 @@
 import static org.hamcrest.Matchers.instanceOf;
 
 public class SemanticTextFieldMapperTests extends MapperTestCase {
-
     @Override
     protected Collection<? extends Plugin> getPlugins() {
         return singletonList(new InferencePlugin(Settings.EMPTY));
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,6 @@ @@
     /**
      * A {@link FieldMapper} for semantic text fields.
-     *
      */
     public class SemanticTextFieldMapper extends FieldMapper implements InferenceFieldMapper {
         public static final String CONTENT_TYPE = "semantic_text";
@@ Expand Down @@