thys/Test.txt
author Christian Urban <christian dot urban at kcl dot ac dot uk>
Fri, 18 Dec 2015 00:37:35 +0000
changeset 83 a8bcb5a0f9b9
parent 67 d86d685273ce
permissions -rw-r--r--
added POSIX relation from the Type-Inference paper

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

>>>>>>> other