Skip to content
Snippets Groups Projects
Commit 5c2b64f7 authored by Dennis Eisold's avatar Dennis Eisold
Browse files

Merge branch 'master' into 'master'

# Conflicts:
#   src/main/java/Enigma/model/Hardware.java
#   src/main/java/Enigma/model/Walze.java
#   src/test/java/Enigma/model/ReflektorTest.java
#   src/test/java/Enigma/model/SteckbrettTest.java
#   src/test/java/Enigma/model/WalzeTest.java
parents e79c03bf 9753b190
No related branches found
No related tags found
1 merge request!20Unittests etc
...@@ -12,7 +12,7 @@ public class Hardware { ...@@ -12,7 +12,7 @@ public class Hardware {
private String nachricht; private String nachricht;
private String kenngruppe; private String kenngruppe;
Hardware() { public Hardware() {
this.walzen = new Walze[4]; this.walzen = new Walze[4];
} }
......
package Enigma.model; package Enigma.model;
import java.time.Year;
/** /**
* Klasse Walze * Klasse Walze
* <p> * <p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment