mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-06 12:23:55 +00:00
Conflicts: java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/AbstractLeaderboardGroupDataRetrievalWorker.java java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixLeaderboardGroupDataRetrievalWorker.java java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixWithContextImpl.java java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker.java java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Boat.java java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Nationality.java java/com.sap.sailing.domain/META-INF/MANIFEST.MF java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/DataMiningEntryPoint.java