Fix merge conflicts

korekontrol · Nov 23, 2023 · e2616ac · e2616ac
1 parent f457e46
commit e2616ac
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/generator/src/templates/nginx/http/error.conf.twig b/generator/src/templates/nginx/http/error.conf.twig
@@ -1,6 +1,2 @@
     error_page 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 422 425 426 428 429 431 451 /errorpage/4xx.html;
     error_page 500 501 502 504 505 506 507 508 509 510 511 /errorpage/5xx.html;
-<<<<<<< HEAD
-    error_page 503 /maintenance/index.html;
-=======
->>>>>>> be9d026 (Don't use custom error page for 503)
diff --git a/images/common/services/tideways/Dockerfile b/images/common/services/tideways/Dockerfile
@@ -6,11 +6,7 @@ ENV TIDEWAYS_ENVIRONMENT=$TIDEWAYS_ENVIRONMENT_DEFAULT
 RUN apt update -y && apt install -yq --no-install-recommends gnupg2 curl sudo ca-certificates wget
 
 RUN echo 'deb https://packages.tideways.com/apt-packages-main any-version main' > /etc/apt/sources.list.d/tideways.list && \
-<<<<<<< HEAD
     wget -qO - 'https://packages.tideways.com/key.gpg' | apt-key add -
-=======
-    wget -qO - https://packages.tideways.com/key.gpg | sudo apt-key add -
->>>>>>> a6dfcfe (Upgrade tideways repository)
 RUN DEBIAN_FRONTEND=noninteractive apt update -y && apt install -yq tideways-daemon && \
     apt autoremove --assume-yes && \
     apt clean && \