Commit de60a142 authored by ungpk's avatar ungpk
Browse files

Merge branch 'master' into 'development'

no idea why these conflicts are there
# Conflicts:
#   src/edu/kit/informatik/Terminal.java
#   src/test/TestBase.java
parents 7777dc6c b9b380fe
......@@ -10,17 +10,17 @@ Also have a look at our [Discord-Server](https://discord.gg/RVxBMVa).
<h4>package test</h4>
The test helper classes.
<h4>package testExamples</h4>
<h4>package test_examples</h4>
Examples showing how to use the package test.
<h4>package programExamples</h4>
<h4>package program_examples</h4>
Contains programs needed for the test examples.
<h4>package finalAssignment1Tests</h4>
<h4>package final_assignment.task_1.tests</h4>
Contains **all** tests for the **"1. Abschlussaufgabe"**
<h4>package finalAssignment2Tests</h4>
<h4>package final_assignment.task_2.tests</h4>
Contains **all** tests for the **"2. Abschlussaufgabe"**
......
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