eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-11 14:50:56 +00:00
Code Activity

Merge branch 'master' into bug4232

Browse Source
This commit is contained in:
Axel Uhl committed 2017-11-23 18:02:38 +01:00
2 parents 59d85d12d9 192e3aa497
commit 11e8eee958
255 files changed
+4382 -2875
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultEditableImpl.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class CompetitorResultEditableImpl implements CompetitorResult {
}
public MergeState getMergeState() {
return mMergeState;
return mMergeState == null ? MergeState.OK : mMergeState; // default for having de-serialized an old version
}
public void setMergeState(MergeState mergeState) {