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

@ -6,11 +6,7 @@ from zoneinfo import ZoneInfo
from collections import OrderedDict
class TawhiriClient:
<<<<<<< HEAD
BASE_URL = "https://api.v2.sondehub.org/tawhiri"
=======
BASE_URL = "https://fly.stratonautica.ru/api/v2/"
>>>>>>> origin/master
TIMEOUT = 15
@staticmethod