From 68306b77836a8e6221aaa53f492b2234a31b9387 Mon Sep 17 00:00:00 2001
From: "jakob.dieterle" <jakob.dieterle@stud.uni-goettingen.de>
Date: Tue, 27 Sep 2022 12:43:31 +0200
Subject: [PATCH] flake8 said it doenst look nice
---
core/tests/test_export.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/core/tests/test_export.py b/core/tests/test_export.py
index f9697fb4..5ef57548 100644
--- a/core/tests/test_export.py
+++ b/core/tests/test_export.py
@@ -97,13 +97,8 @@ class ExportInstanceTest(APITestCase):
self.client = APIClient()
self.client.force_login(user=self.data['reviewers'][0])
self.response = self.client.get('/api/instance/export/',
-<<<<<<< HEAD
data={'setPasswords': True,
'selected_exam': self.data['exams'][0].exam_type_id})
-=======
- data={'setPasswords': True,
- 'selected_exam': self.data['exams'][0].exam_type_id})
->>>>>>> 27c5fd7 (reverted changes to export tests as well)
def test_can_access(self):
self.assertEqual(status.HTTP_200_OK, self.response.status_code)
--
GitLab