mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-23 14:08:40 +00:00
Merge branch 'master' into bug5510
Conflicts: java/com.sap.sailing.server/SailingServer (No Proxy).launch
This commit is contained in:
@@ -33,6 +33,5 @@ Export-Package: com.sap.sailing.domain.common,
|
||||
com.sap.sailing.domain.common.windfinder
|
||||
Require-Bundle: com.sap.sse.common,
|
||||
com.sap.sse.security.common,
|
||||
com.sap.sse.datamining.annotations;bundle-version="1.0.0",
|
||||
org.json.simple;bundle-version="1.1.0"
|
||||
com.sap.sse.datamining.annotations;bundle-version="1.0.0"
|
||||
Automatic-Module-Name: com.sap.sailing.domain.common
|
||||
|
||||
Reference in New Issue
Block a user