mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-04 03:13:49 +00:00
Fredrik Teschke
2c986f7be9
Conflicts: java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java