fix merge conflict again

2023-05-17 03:04:06 +10:00 · 2023-05-17 03:04:06 +10:00 · 44e1aef2ae
parent 31cd4f98a8
commit 44e1aef2ae
1 changed files with 2 additions and 4 deletions
--- a/pairent_backend/pairent_app/serializer.py
+++ b/pairent_backend/pairent_app/serializer.py
@ -1,10 +1,8 @@
 from rest_framework import serializers

-<<<<<<< HEAD
-from .models import Apartament, User, PsychTestAnswers
-=======
+from .models import Apartament, User, PsychTestAnswers, AuthToken
 from .models import Apartament, User, AuthToken
->>>>>>> 4f5f817d835f6a53448e7d60bb7591c24c825e96
+


 class ApartamentListSerializer(serializers.ModelSerializer):