Martin Plümicke
83b9f7edb8
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2
Conflicts: src/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. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Committer: Martin Plümicke <pl@macmini_pl.verw.ba-horb.de> On branch bytecode2 Your branch and 'origin/bytecode2' have diverged, and have 1 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. Changes to be committed: modified: src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Description
Languages
Java
97.9%
ANTLR
2.1%