mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-22 20:13:52 +00:00
Conflicts: java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java java/com.sap.sailing.server.gateway/WEB-INF/web.xml java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch