Martin Plümicke 47783083b0 Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test ... Conflicts: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again.		2019-03-07 13:42:26 +01:00
..
main	Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test	2019-03-07 13:42:26 +01:00
test	modified: ../../resources/bytecode/javFiles/MatrixOP.jav	2019-02-28 15:38:30 +01:00