Hi,
i compiled your multi-user modifikation with my SDK for trunk. First i managed to get it to work and i could run it on my system. Now i need to recompile it with the same SDK again but i always get a lot of merge conflicts. On the first time i compiled it without any errors. I tried it several times but always got the same errors. On Friday i did the same as today and it worked.
I tried alle branches of hnyman but i always get that merge conflict.
Sorry but i work with git only as much as possible and don´t know what to do.
Can anyone help me?
Thanks