forked from afanasyev.aa/stratoflights
resolve merge conflicts
This commit is contained in:
commit
5eb8a4a4e2
5 changed files with 32 additions and 0 deletions
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue