eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-22 20:13:52 +00:00
Code Activity

Merge branch 'master' into foiling

Browse Source 
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
This commit is contained in:
Steffen Schaefer committed 2016-06-27 16:15:41 +02:00
2 parents 91ff2cb9fc 2ffc4972a4
commit 0a1b56765c
45 files changed
+497 -168
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
+2 -1
View File
@@ -449,7 +449,8 @@ public class DummyTrackedRace extends TrackedRaceWithWindEssentials {
}
@Override
public void detachRaceLog(Serializable identifier) {
public RaceLog detachRaceLog(Serializable identifier) {
return null;
}
@Override