Commit 14fc8b8c authored by Christian Kniss's avatar Christian Kniss

Merge branch 'develop' into 'GradleUmstellung'

# Conflicts:
#   src/main/java/de/bsvrz/dua/progglaette/package-info.java
#   src/main/java/de/bsvrz/dua/progglaette/progglaette/GlaetteWarnungUndPrognose.java
#   src/main/java/de/bsvrz/dua/progglaette/progglaette/package-info.java
#   src/test/java/de/bsvrz/dua/progglaette/tests/DuAProgGlaetteTestBase.java
#   src/test/java/de/bsvrz/dua/progglaette/tests/TestDuAProgGlaette.java
parents dcad993c 72210acf
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Built-By: Peuker
Created-By: Apache Maven 3.2.3
Build-Jdk: 1.8.0_92
Platzhalterdatei, damit Ornderstruktur fuer Gradle in GitLab eingecheckt werden kann (Git ignoriert leere Ordner).
\ No newline at end of file
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Built-By: Peuker
Created-By: Apache Maven 3.2.3
Build-Jdk: 1.8.0_92
Platzhalterdatei, damit Ornderstruktur fuer Gradle in GitLab eingecheckt werden kann (Git ignoriert leere Ordner).
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment