finishing solving strange conflicts for merge...

TODO.org

src/_tags.in

src/cocospec/kindIdent.ml

src/cocospec/kindIdent.mli

src/cocospec/kindLib.ml

src/cocospec/kindLib.mli

src/cocospec/kindLog.ml

src/cocospec/kindLog.mli

src/cocospec/kindLustreAst.ml

src/cocospec/kindLustreAst.mli

src/cocospec/kindLustreLexer.mll

src/cocospec/kindLustreParser.mly

src/cocospec/kindPretty.ml

src/cocospec/kindPretty.mli

src/corelang.ml

src/corelang.mli

src/lexerLustreSpec.mll

src/lexer_lustre.mll

src/lustre_types.ml

src/machine_code_types.ml