Fix merge

nik9000 · Oct 29, 2023 · 824412c · 824412c
1 parent a2b6707
commit 824412c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockFactory.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockFactory.java
@@ -175,12 +175,9 @@ public IntVector.Builder newIntVectorBuilder(int estimatedSize) {
         return new IntVectorBuilder(estimatedSize, this);
     }
 
-<<<<<<< HEAD
     /**
      * Build a {@link IntVector.FixedBuilder} that never grows.
      */
-=======
->>>>>>> main
     public IntVector.FixedBuilder newIntVectorFixedBuilder(int size) {
         return new IntVectorFixedBuilder(size, this);
     }