Michael Uhl 85144cb6d8 Merge branch 'unify-test' into plugin ... # Conflicts: # pom.xml # src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java # src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java		2019-02-01 21:23:27 +01:00
..
de/dhbwstuttgart/typeinference/unify	Merge branch 'unify-test' into plugin	2019-02-01 21:23:27 +01:00
main	Merge branch 'bytecode2' into plugin	2019-01-04 21:26:29 +01:00
test	Merge branch 'bytecode2' into plugin	2019-01-11 14:51:18 +01:00