From d07da55eacc752dea2f2f36a7690311cb6ad715f Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Thu, 24 Mar 2016 13:54:03 -0400 Subject: [PATCH] fix merge fail --- awx/api/serializers.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index e850997ca9..be34117c2a 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1665,11 +1665,8 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer): notifiers_any = reverse('api:job_template_notifiers_any_list', args=(obj.pk,)), notifiers_success = reverse('api:job_template_notifiers_success_list', args=(obj.pk,)), notifiers_error = reverse('api:job_template_notifiers_error_list', args=(obj.pk,)), -<<<<<<< HEAD access_list = reverse('api:job_template_access_list', args=(obj.pk,)), -======= survey_spec = reverse('api:job_template_survey_spec', args=(obj.pk,)) ->>>>>>> ddd163c21bb6b6a2c83f90cb38421d201f936130 )) if obj.host_config_key: res['callback'] = reverse('api:job_template_callback', args=(obj.pk,))