From 4e3330e80f2aff34005bd3f7c8ac46a932556f83 Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@painless-security.com>
Date: Fri, 25 Mar 2022 12:44:32 -0300
Subject: [PATCH] fix: remove duplicate lines from merge
---
docker/app.Dockerfile | 3 ---
ietf/templates/release/about.html | 1 -
2 files changed, 4 deletions(-)
diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile
index ba28e3626..f153928a5 100644
--- a/docker/app.Dockerfile
+++ b/docker/app.Dockerfile
@@ -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 && \
diff --git a/ietf/templates/release/about.html b/ietf/templates/release/about.html
index d53807c51..6de54bf8b 100644
--- a/ietf/templates/release/about.html
+++ b/ietf/templates/release/about.html
@@ -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 %}