From 21da805e787b47637aaf82ea9c293229d752a5f2 Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 13 Apr 2023 19:19:20 +0800 Subject: [PATCH] fix: fix conflicts --- apps/accounts/serializers/account/account.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/accounts/serializers/account/account.py b/apps/accounts/serializers/account/account.py index 213672679..7a4d90919 100644 --- a/apps/accounts/serializers/account/account.py +++ b/apps/accounts/serializers/account/account.py @@ -385,10 +385,7 @@ class AccountHistorySerializer(serializers.ModelSerializer): class Meta: model = Account.history.model - fields = [ - 'id', 'secret', 'secret_type', 'version', - 'history_date', 'history_user' - ] + fields = ['id', 'secret', 'secret_type', 'version', 'history_date', 'history_user'] read_only_fields = fields extra_kwargs = { 'history_user': {'label': _('User')},