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

4
stratoflights_api/models.py
View file

@ -39,7 +39,11 @@ class Satellite(models.Model):
class TelemetryPacket(models.Model):
user = models.ForeignKey(
<<<<<<< HEAD
get_user_model(), on_delete=models.SET_NULL, null=True, blank=True)
=======
get_user_model(), on_delete=models.CASCADE, default=0)
>>>>>>> origin/master
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
satellite = models.ForeignKey(
Satellite, on_delete=models.CASCADE, related_name="telemetry")