From 07dce242a0af1ca71d9b5af87e1753c3b8a11391 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 23 May 2017 07:20:49 +0200
Subject: [PATCH] Fix duplicate bugfix conflict
---
submissions/constants.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/submissions/constants.py b/submissions/constants.py
index 5d9235c27..84638110f 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -60,7 +60,6 @@ SUBMISSION_EIC_RECOMMENDATION_REQUIRED = [
SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
STATUS_UNASSIGNED,
STATUS_RESUBMISSION_INCOMING,
- STATUS_RESUBMITTED_REJECTED,
'assignment_failed',
'resubmitted_rejected',
STATUS_RESUBMITTED_REJECTED,
@@ -70,7 +69,6 @@ SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
# Submissions which should not appear in search lists
SUBMISSION_STATUS_PUBLICLY_UNLISTED = SUBMISSION_STATUS_PUBLICLY_INVISIBLE + [
- STATUS_RESUBMITTED_REJECTED_VISIBLE,
'resubmitted',
'resubmitted_rejected_visible',
STATUS_RESUBMITTED_REJECTED_VISIBLE,
--
GitLab