From 754f1c73e27fea203be1171acbe0a636708c2cc3 Mon Sep 17 00:00:00 2001 From: Henning Date: Tue, 15 Oct 2019 11:47:00 +0200 Subject: [PATCH] Remove merge artifcat --- .../resources/templates/submissions.html.orig | 81 ------------------- 1 file changed, 81 deletions(-) delete mode 100644 src/main/resources/templates/submissions.html.orig diff --git a/src/main/resources/templates/submissions.html.orig b/src/main/resources/templates/submissions.html.orig deleted file mode 100644 index 974982882..000000000 --- a/src/main/resources/templates/submissions.html.orig +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - -
- -
- There are no submissions yet. -
- -<<<<<<< HEAD - Download submissions as .csv -======= -
- - - -
- -
- - - evaluations are pending -
->>>>>>> master - - - - - - - - - - - - - - -
User
- no answer -
-
- - - - -
-
-
    -
  • - -
    • -
-
-
-
- -
- -