thys/Test.txt
author Christian Urban <christian dot urban at kcl dot ac dot uk>
Thu, 21 Jan 2016 12:47:20 +0000
changeset 89 9613e6ace30f
parent 67 d86d685273ce
permissions -rw-r--r--
added theory for star

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

>>>>>>> other