Merge branch 'grebing_luong_workbranch' of...

Merge branch 'grebing_luong_workbranch' of C:\Users\Lulu\Desktop\Bachelor\ProofScriptParser with conflicts.

Merge branch 'grebing_luong_workbranch' of...
Merge branch 'grebing_luong_workbranch' of C:\Users\Lulu\Desktop\Bachelor\ProofScriptParser with conflicts.
4fbb71f4 · Lulu Luong · 62680106 · 4fbb71f4 · 4fbb71f4 · 4fbb71f4
Commit 4fbb71f4 authored Nov 26, 2018 by Lulu Luong
--- a/keydeps/lib/components/key.core.jar
+++ b/keydeps/lib/components/key.core.jar
--- a/keydeps/lib/components/key.ui.jar
+++ b/keydeps/lib/components/key.ui.jar
--- a/keydeps/lib/components/key.util.jar
+++ b/keydeps/lib/components/key.util.jar