From 44e1aef2aec74ea9593c30bfe24f1b142c26c702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=A1=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=83=D0=BB=D0=BE=D0=B2?=
 <denissarapulov@MacBook-Air-Denis.local>
Date: Wed, 17 May 2023 03:04:06 +1000
Subject: [PATCH] fix merge conflict again

---
 pairent_backend/pairent_app/serializer.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pairent_backend/pairent_app/serializer.py b/pairent_backend/pairent_app/serializer.py
index 0102180..fe05f1e 100644
--- 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):