thys/Test.txt
author Christian Urban <christian dot urban at kcl dot ac dot uk>
Wed, 06 Jan 2016 12:24:29 +0000
changeset 87 030939b7d475
parent 67 d86d685273ce
permissions -rw-r--r--
added type inference paper and updated Re.thy

<<<<<<< local
test2
=======
test
test file

>>>>>>> other