mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-06-23 01:22:08 +08:00
e36dbe97b5
# Conflicts: # common/api/__init__.py # panda # release/build_release.sh # release/files_common # selfdrive/car/card.py # selfdrive/car/toyota/carcontroller.py # selfdrive/controls/controlsd.py # selfdrive/controls/radard.py # selfdrive/ui/qt/api.cc # selfdrive/ui/qt/maps/map.cc # selfdrive/ui/ui.cc # system/athena/manage_athenad.py # system/athena/manage_sunnylinkd.py # system/athena/sunnylinkd.py # system/manager/gitlab_runner.sh # system/manager/manager.py # system/manager/mapd_installer.py # system/manager/process_config.py # system/manager/sunnylink.py # system/sentry.py