diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 21c1d460f0..130cc468e9 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD 05ba201bcf97b6c1067dbcde2a60f71f43469c56 ======= 5ec442eb9d557ed7825953410cb1852e35af7df5 >>>>>>> c5f413817 (update process replay ref commit) +======= +75af99e2c84f42a4492eca378dc7bd74d827d5c5 +>>>>>>> d9939ac87 (last ref change)