Skip to content

R
red-ci-cd
Commit 43fe7931 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

fixing conflict

parent 55a37042
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/applicationlayer/management/batchupload/views.py
View file @ 43fe7931
...@@ -256,10 +256,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -256,10 +256,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
raise ParseError( raise ParseError(
department_error department_error
) )
<<<<<<< HEAD
# user type authorization and user type per user # user type authorization and user type per user
=======
else: else:
user_department = Department.objects.get( user_department = Department.objects.get(
name__icontains=keys['department'] name__icontains=keys['department']
...@@ -268,7 +266,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -268,7 +266,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
default_app = Application.objects.filter( default_app = Application.objects.filter(
excel_code=keys['default_app'] excel_code=keys['default_app']
).first() ).first()
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
dept_code = Department.objects.get( dept_code = Department.objects.get(
code=keys['Department_Code'] code=keys['Department_Code']
......
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