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

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

src/main/java/META-INF/MANIFEST.MF

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Manifest-Version: 1.0

Archiver-Version: Plexus Archiver

Built-By: Peuker

Created-By: Apache Maven 3.2.3

Build-Jdk: 1.8.0_92

src/main/resources/nichtVorhanden.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Platzhalterdatei, damit Ornderstruktur fuer Gradle in GitLab eingecheckt werden kann (Git ignoriert leere Ordner).
 
 No newline at end of file

src/test/java/META-INF/MANIFEST.MF

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Manifest-Version: 1.0

Archiver-Version: Plexus Archiver

Built-By: Peuker

Created-By: Apache Maven 3.2.3

Build-Jdk: 1.8.0_92

src/test/resources/nichtVorhanden.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Platzhalterdatei, damit Ornderstruktur fuer Gradle in GitLab eingecheckt werden kann (Git ignoriert leere Ordner).
 
 No newline at end of file