Merge branch 'master' of gitlab.math.univ-paris-diderot.fr:cauderlier/math_transfer
Conflicts: interop/arith/Makefile interop/arith/natural_coq.fcl interop/arith/natural_hol.fcl
Please register or sign in to comment
Conflicts: interop/arith/Makefile interop/arith/natural_coq.fcl interop/arith/natural_hol.fcl