diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 130cc468e9..b7ea0f980d 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -05ba201bcf97b6c1067dbcde2a60f71f43469c56 -======= -5ec442eb9d557ed7825953410cb1852e35af7df5 ->>>>>>> c5f413817 (update process replay ref commit) -======= -75af99e2c84f42a4492eca378dc7bd74d827d5c5 ->>>>>>> d9939ac87 (last ref change) +0d0a70e0a7f3b711c5bfd66b0cee5f04497404cf \ No newline at end of file