GH-129 Fix Conflicts

rilling · Apr 8, 2024 · 3419b4b · 3419b4b
1 parent c621a45
commit 3419b4b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/...e/dennisguse/opentracks/ui/aggregatedStatistics/daySpecificStats/DaySpecificActivity.java b/...e/dennisguse/opentracks/ui/aggregatedStatistics/daySpecificStats/DaySpecificActivity.java
@@ -10,10 +10,7 @@
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.TrackDataHub;
 import de.dennisguse.opentracks.data.TrackPointIterator;
-<<<<<<< HEAD
-=======
 import de.dennisguse.opentracks.data.models.Distance;
->>>>>>> 08fc483e8 (Pre-processed data)
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.data.models.TrackSegment;