forked from JavaTX/JavaCompilerCore
aac113e12e
src/de/dhbwstuttgart/core/JavaTXCompiler.java src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.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.