Merge pull request #148 from IntelLabs/v2.3.0fix

Fix the merge error in the docker file
IntelLabs · Jun 27, 2022 · b62281c · b62281c
2 parents 280e695 + bf8b3ea
commit b62281c
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -67,19 +67,9 @@ RUN cd / && tar xf 1.3.1.tar.gz && rm 1.3.1.tar.gz && \
     ../bootstrap --prefix=/usr/local/ && make $BUILD_THREADS && make install-tiledb && \
     rm -rf /TileDB-1.3.1
 
-<<<<<<< HEAD
-
-RUN apt-get install -y maven
-
-RUN ln -s /grpc/third_party/protobuf/cmake/build/protoc \
-    /grpc/third_party/protobuf/src/protoc && \
-    cd /grpc/third_party/protobuf/java/core && \
-    mvn package && \
-=======
 # Maven
 RUN ln -s /grpc/third_party/protobuf/cmake/build/protoc /grpc/third_party/protobuf/src/protoc && \
     cd /grpc/third_party/protobuf/java/core && mvn package && \
->>>>>>> develop
     cp $(ls target/protobuf-java*.jar) /usr/share/java/protobuf.jar
 
 # Valijson