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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/Enigma/model/Hardware.java
parents a2f47e57 5c2b64f7
No related branches found
No related tags found
No related merge requests found
Pipeline #181 failed with stages
Stage: clean
    Stage: build
      Stage: test
        Stage: deploy
          in 2 minutes and 55 seconds
          Hide whitespace changes
          Inline Side-by-side
          src/main/java/Enigma/model/Walze.java
          + 2
          − 0
          View file @ 719782b1
          package Enigma.model; package Enigma.model;
          import java.time.Year;
          /** /**
          * Klasse Walze * Klasse Walze
          * <p> * <p>
          ......
          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