mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-08 20:12:23 +00:00
Conflicts: java/com.sap.sse.security.common/src/com/sap/sse/security/shared/impl/PermissionAndRoleAssociation.java java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java