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