thys/Test.txt
author Christian Urban <christian dot urban at kcl dot ac dot uk>
Tue, 02 Feb 2016 02:27:16 +0000
changeset 94 5b01f7c233f8
parent 67 d86d685273ce
permissions -rw-r--r--
proved also finiteness of non-problematic values

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

>>>>>>> other