Skip to content

Commit

Permalink
Fix upstream conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunnyhaibin
sunnyhaibin committed Sep 11, 2023
1 parent ff1d7d4 commit d857c01
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion selfdrive/car/volkswagen/interface.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from openpilot.common.conversions import Conversions as CV
from openpilot.selfdrive.car import get_safety_config, create_mads_event
from openpilot.selfdrive.car.interfaces import CarInterfaceBase
from openpilot.selfdrive.car.volkswagen.values import CAR, PQ_CARS, CANBUS, NetworkLocation, TransmissionType, GearShifter
from openpilot.selfdrive.car.volkswagen.values import CAR, PQ_CARS, CANBUS, NetworkLocation, TransmissionType, GearShifter, BUTTON_STATES

ButtonType = car.CarState.ButtonEvent.Type
EventName = car.CarEvent.EventName
Expand Down

0 comments on commit d857c01

Please sign in to comment.