From 9f2a0080c0de0012f8842a62e370c7a6b71bc15d Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Sun, 12 Mar 2023 17:11:02 -0400
Subject: [PATCH] gpxd: fix upstream conflict

---
 selfdrive/gpxd/gpx_uploader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selfdrive/gpxd/gpx_uploader.py b/selfdrive/gpxd/gpx_uploader.py
index 4c6e57aa8e..3588fdf73c 100644
--- a/selfdrive/gpxd/gpx_uploader.py
+++ b/selfdrive/gpxd/gpx_uploader.py
@@ -28,7 +28,7 @@ from common.realtime import Ratekeeper
 from system.version import get_version
 
 # for uploader
-from selfdrive.loggerd.xattr_cache import getxattr, setxattr
+from system.loggerd.xattr_cache import getxattr, setxattr
 import glob
 import requests
 import json