fix: fix conflicts

2 years ago · 21da805e78
parent 928513edd0
commit 21da805e78
1 changed files with 1 additions and 4 deletions
--- 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')},