Try and get conflicts.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@29 a79c6d67-9624-418e-af80-2fa85c78f146
Merged files.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@30 a79c6d67-9624-418e-af80-2fa85c78f146