thys/Test.txt
author Christian Urban <christian dot urban at kcl dot ac dot uk>
Sat, 30 Jan 2016 13:12:36 +0000
changeset 90 3c8cfdf95252
parent 67 d86d685273ce
permissions -rw-r--r--
proved some lemmas about star and mkeps (injval etc not yet done)

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

>>>>>>> other