resolve merge conflicts

This commit is contained in:
Vasilisk9812 2026-05-25 20:57:44 +09:00
parent 5eb8a4a4e2
commit 0261b41a71
5 changed files with 0 additions and 32 deletions

View file

@ -124,10 +124,7 @@ class TelemetryPacketSerializer(serializers.ModelSerializer):
model = TelemetryPacket
fields = ['id', 'timestamp', 'lat', 'lon', 'alt', 'payload']
read_only_fields = ['id']
<<<<<<< HEAD
extra_kwargs = {'timestamp': {'required': False}}
=======
>>>>>>> origin/master
class SavedPointSerializer(serializers.ModelSerializer):