Remove merge conflict markers (#1392)

b/282188909
youtube · Aug 25, 2023 · 6426d87 · 6426d87
1 parent b6e23f7
commit 6426d87
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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