From 6426d87cb68218f3b752372b3d0dc679dbffead7 Mon Sep 17 00:00:00 2001 From: Oscar Vestlie Date: Fri, 25 Aug 2023 10:47:10 -0700 Subject: [PATCH] Remove merge conflict markers (#1392) b/282188909 --- docker/docsite/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/docsite/Dockerfile b/docker/docsite/Dockerfile index 2e164c87bc09..6b1bd9d9eaf9 100644 --- a/docker/docsite/Dockerfile +++ b/docker/docsite/Dockerfile @@ -46,10 +46,7 @@ RUN chmod a+x /usr/local/bin/gn RUN mkdir /project_out_dir \ && chown ${USER:-defaultuser}:defaultgroup /project_out_dir -<<<<<<< HEAD RUN git config --global --add safe.directory /code -======= ->>>>>>> 77f6a7c80d7 (Fix git config for /code in Linux containers (#611)) COPY Gemfile /app/Gemfile # Note: This file was generated by running a working version of this Docker