mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-21 05:05:31 +00:00
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts: .gitignore
This commit is contained in:
@@ -16,3 +16,6 @@ sailing_debug0*
|
||||
/mobile/com.sap.sailing.racecommittee.glue/gen/*
|
||||
/mobile/com.sap.sailing.racecommittee.glue/bin
|
||||
/mobile/com.sap.sailing.racecommittee.glue/gen
|
||||
/mobile/com.sap.sailing.racecommittee.glue/bin/com.sap.sailing.racecommittee.glue.jar
|
||||
/mobile/com.sap.sailing.racecommittee.glue/bin/jarlist.cache
|
||||
/java/com.sap.sailing.server.gateway.serialization.test/.settings/*.prefs
|
||||
|
||||
Reference in New Issue
Block a user