TMSS-64: Removed checked in merge conflict

SAS/TMSS/backend/test/t_scheduling_units.py

@@ -104,14 +104,9 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
         task_ingest.save()
         # There is no template defined for ingest yet ...but I can use preprocessing pipeline, only the template type matters
         # ....should become other thing in future but for this test does not matter
-<<<<<<< HEAD
-        subtask_data = Subtask_test_data(task_ingest,
-                                         state=models.SubtaskState.objects.get(value="defined"),
-                                         subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'))
-=======
         subtask_data = Subtask_test_data(state=models.SubtaskState.objects.get(value="defined"),
-                                         subtask_template=models.SubtaskTemplate.objects.get(name='pipeline control'))
->>>>>>> master
+                                         subtask_template=models.SubtaskTemplate.objects.get(name='preprocessing pipeline'))
+
         if "ingest" in skip_create_subtask:
             subtask_ingest = None
         else: