# Conflicts:
#	client/src/test/resources/test-config.yml

# Conflicts:
#	client/src/main/java/de/fitko/fitconnect/client/SenderClient.java
#	client/src/main/java/de/fitko/fitconnect/client/SubscriberClient.java
#	client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineClient.java
#	client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java
#	core/src/main/java/de/fitko/fitconnect/core/auth/DefaultOAuthService.java

Resolve "CheckStyle Konfiguration"

See merge request !32

# Conflicts:
#	client/src/main/java/de/fitko/fitconnect/client/SenderClient.java
#	client/src/test/java/de/fitko/fitconnect/client/ClientIntegrationTest.java
#	client/src/test/java/de/fitko/fitconnect/client/SenderClientTest.java

Lizenzangaben via REUSE

See merge request !24

Resolve "Deklaration der Ziel JVM Version"

See merge request !26

Resolve "Mehrfache Deklaration der JUnit Jupiter Abhängigkeiten"

See merge request !25

Merge branch '5-alle-plugins-die-im-build-verwendet-werden-mithilfe-pluginmanagement-festlegen' into 'main'

Resolve "Alle Plugins die im Build verwendet werden mithilfe pluginManagement festlegen"

See merge request !27

Entferne OpenAPI-Modul

See merge request !28