Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/edu/kit/formal/psdb/gui/controller/DebuggerMain.java # src/main/java/edu/kit/formal/psdb/interpreter/graphs/ProofTreeController.java
Showing
File moved
# Conflicts: # src/main/java/edu/kit/formal/psdb/gui/controller/DebuggerMain.java # src/main/java/edu/kit/formal/psdb/interpreter/graphs/ProofTreeController.java