Project import generated by Copybara.

PiperOrigin-RevId: 267280553

Dockerfile

@@ -24,10 +24,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
         build-essential \
         ca-certificates \
-<<<<<<< HEAD
-=======
         curl \
->>>>>>> Project import generated by Copybara.
         git \
         wget \
         unzip \
@@ -39,11 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libopencv-video-dev \
         software-properties-common && \
     add-apt-repository -y ppa:openjdk-r/ppa && \
-<<<<<<< HEAD
-    apt-get update && apt-get install -y openjdk-11-jdk && \
-=======
     apt-get update && apt-get install -y openjdk-8-jdk && \
->>>>>>> Project import generated by Copybara.
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*