Fix merge issues

seamapi · May 16, 2024 · cb0d044 · cb0d044
1 parent a9a7bf0
commit cb0d044
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/lib/ui/noise-sensor/NoiseSensorActivityList.tsx b/src/lib/ui/noise-sensor/NoiseSensorActivityList.tsx
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import { useEvents } from 'lib/seam/events/use-events.js'
 import { NoiseSensorEventItem } from 'lib/ui/noise-sensor/NoiseSensorEventItem.js'
-=======
->>>>>>> 4393fa0eb9f4d55fa0ab31fb392bc6f53df5f5ae
 import type { NoiseSensorDevice } from 'seamapi'
 
 import { useEvents } from 'lib/seam/events/use-events.js'