fix: remove duplicate lines from merge

This commit is contained in:
Jennifer Richards 2022-03-25 12:44:32 -03:00
parent 7c6fa167f1
commit 4e3330e80f
No known key found for this signature in database
GPG key ID: 26801E4DC0928410
2 changed files with 0 additions and 4 deletions

View file

@ -131,9 +131,6 @@ ADD https://github.com/validator/validator/releases/download/latest/vnu.jar /
ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
RUN chmod +rx /usr/local/bin/wait-for
ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
RUN chmod +rx /usr/local/bin/wait-for
# Copy the startup file
COPY docker/scripts/app-init.sh /docker-init.sh
RUN sed -i 's/\r$//' /docker-init.sh && \

View file

@ -1,6 +1,5 @@
{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
{% extends "base.html" %}
{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
{% load origin %}
{% block title %}About the Datatracker{% endblock %}
{% block content %}