fix conflict
This commit is contained in:
commit
615e84e04a
|
|
@ -121,4 +121,4 @@ class OutputMaterialViewSet(CreateUpdateModelAMixin, ModelViewSet):
|
||||||
return OutputMaterialListSerializer
|
return OutputMaterialListSerializer
|
||||||
elif self.action == 'update':
|
elif self.action == 'update':
|
||||||
return OutputMaterialUpdateSerializer
|
return OutputMaterialUpdateSerializer
|
||||||
return OutputMaterialSerializer
|
return OutputMaterialSerializer
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue