mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-18 11:49:09 +00:00
Conflicts: .gitignore java/com.sap.sailing.server/SailingServer (No Proxy).launch mobile/com.sap.sailing.android.shared/.classpath mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java