merge conflict

This commit is contained in:
Sam
2021-02-24 11:57:33 +00:00
4 changed files with 39 additions and 33 deletions

View File

@@ -14,7 +14,7 @@ class ProductSerializer(TaggitSerializer, serializers.ModelSerializer):
class Meta:
model = Product
exclude = ['updated', 'creator']
fields = '__all__'
class SearchResultSerializer(TaggitSerializer, serializers.ModelSerializer):