Tochka
/
legacy
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflict again

This commit is contained in:
Денис Сарапулов 2023-05-17 03:04:06 +10:00
parent 31cd4f98a8
commit 44e1aef2ae
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pairent_backend/pairent_app/serializer.py
View File

@ -1,10 +1,8 @@
from rest_framework import serializers from rest_framework import serializers
<<<<<<< HEAD from .models import Apartament, User, PsychTestAnswers, AuthToken
from .models import Apartament, User, PsychTestAnswers
=======
from .models import Apartament, User, AuthToken from .models import Apartament, User, AuthToken
>>>>>>> 4f5f817d835f6a53448e7d60bb7591c24c825e96
class ApartamentListSerializer(serializers.ModelSerializer): class ApartamentListSerializer(serializers.ModelSerializer):