From 00ade5701e2bc9d0e6c0c99221d5a6900acca5f2 Mon Sep 17 00:00:00 2001
From: goei <goei@astron.nl>
Date: Wed, 15 Apr 2020 12:07:36 +0200
Subject: [PATCH] TMSS-178: Remove merge comment and fixed merge conflict
---
SAS/TMSS/test/tmss_test_environment_unittest_setup.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/SAS/TMSS/test/tmss_test_environment_unittest_setup.py b/SAS/TMSS/test/tmss_test_environment_unittest_setup.py
index bec8ad5b7ea..5fe5bbe88f4 100644
--- a/SAS/TMSS/test/tmss_test_environment_unittest_setup.py
+++ b/SAS/TMSS/test/tmss_test_environment_unittest_setup.py
@@ -71,13 +71,9 @@ def _call_API_and_assert_expected_response(test_instance, url, call, data, expec
content = response.content.decode('utf-8')
-<<<<<<< Updated upstream
- if response.status_code in range(200, 300):
-=======
from django.db import models
if response.status_code in range(200, 300) and expected_content is not None:
->>>>>>> Stashed changes
r_dict = json.loads(content)
for key, value in expected_content.items():
if key not in r_dict.keys():
--
GitLab