eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

bug3484 PairingListRegattaAdapter fixed

Browse Source
This commit is contained in:
Kuck committed 2017-11-07 10:21:55 +01:00
1 parent fa7ba27b43
commit da301ed57f
1 file changed
+1 -10
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/PairingListRegattaAdapter.java
+1 -10
View File
@@ -1,15 +1,6 @@
package com.sap.sailing.domain.base;
<<<<<<< HEAD
import com.sap.sse.pairinglist.CompetitionFormat;
import com.sap.sse.pairinglist.CompetitionFormat;
public interface PairingListRegattaAdapter<Flight, Group, Competitor> extends CompetitionFormat<Flight, Group, Competitor> {
=======
import com.sap.sse.pairinglist.PairingFrameProvider;
public interface PairingListRegattaAdapter<Flight, Group, Competitor> extends PairingFrameProvider {
>>>>>>> c6840c6f8abe1d8de70e395003205c11e79c2495
}