afanasyev.aa/stratoflights
1
Fork 1
Code Issues Pull requests Projects Releases Activity

resolve merge conflicts

Browse source
This commit is contained in:
Vasilisk9812 2026-05-25 20:56:26 +09:00
commit 5eb8a4a4e2
5 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stratoflights_api/serializers.py
View file

@ -124,7 +124,10 @@ 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):