fix merge conflict again
This commit is contained in:
parent
31cd4f98a8
commit
44e1aef2ae
|
@ -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):
|
||||||
|
|
Loading…
Reference in New Issue