From b92caa24d3db7cbf6c6acf7b551196f51cae3af5 Mon Sep 17 00:00:00 2001 From: Matthew Glanz Date: Tue, 7 Nov 2023 16:08:58 -0500 Subject: [PATCH] Merge Conflicts --- ACMAS/app/ACMAS_Web/templates/_base.html | 258 ++++-------------- .../app/ACMAS_Web/templates/upload-file.html | 110 ++++---- .../ACMAS_Web/templates/upload-manually.html | 99 ++----- 3 files changed, 138 insertions(+), 329 deletions(-) diff --git a/ACMAS/app/ACMAS_Web/templates/_base.html b/ACMAS/app/ACMAS_Web/templates/_base.html index 483038c..2cbcbc3 100644 --- a/ACMAS/app/ACMAS_Web/templates/_base.html +++ b/ACMAS/app/ACMAS_Web/templates/_base.html @@ -51,235 +51,93 @@ {% url 'uploadFile' as upload_url2 %} {% url 'uploadManually' as upload_url3 %} - +{% block body %} -{% block body %} - + {% comment %} - - - - {% endcomment %} - {% comment %} {% endcomment %} -