GH-129 Fix Conflicts

rilling · Apr 7, 2024 · 188025c · 188025c
1 parent 11cb251
commit 188025c
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;