sshane / openpilot

DOES NOT SUPPORT COMMA 3X - Stock Additions (0.8.14): 3/automatic following distance profiles, customizable fork params with opEdit, and a smoother longitudinal experience for TSS2 Toyotas
MIT License
220 stars 85 forks source link

[FIX] unresolved merge conflicts #568

Closed bensonkwek closed 2 years ago

bensonkwek commented 2 years ago

Unresolve merge conflict found in latcontrol_pid.py