mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-22 21:55:39 +00:00
Steffen Schaefer
1e00d2d194
# Conflicts: # java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF # java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF # java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF # java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java # java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF # java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF # java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java # java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java # java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java # java/com.sap.sailing.polars.datamining/META-INF/MANIFEST.MF # java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java # java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java # java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF # java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java # java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java # java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF # java/com.sap.sailing.server/META-INF/MANIFEST.MF # java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java # java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java # java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java # java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java # java/com.sap.sse.security.test/META-INF/MANIFEST.MF # java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java # java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java # java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF # java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java # java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java # java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java # java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java