Skip to content

R
red-ci-cd
Commit 9b5807a4 authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

{dev bugfix} merege conflicts

parent 9580c4ae
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/applicationlayer/cms/template/header/views.py
View file @ 9b5807a4
...@@ -39,11 +39,7 @@ from django_filters.rest_framework import DjangoFilterBackend ...@@ -39,11 +39,7 @@ from django_filters.rest_framework import DjangoFilterBackend
class ChangeRequestTemplatesViewset(viewsets.ModelViewSet): class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
<<<<<<< HEAD
#comment
=======
>>>>>>> feature-prod-view-all-template
# queryset = models.ChangeRequestTemplateHeader.objects.all() # queryset = models.ChangeRequestTemplateHeader.objects.all()
queryset = models.ChangeRequestTemplateHeader.objects.select_related( queryset = models.ChangeRequestTemplateHeader.objects.select_related(
'created_by_user', 'created_by_department' 'created_by_user', 'created_by_department'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment