6 maj 2011 kl. 20.28 skrev Russell Bryant: > > ----- Original Message ----- >> There are two files in trunk/doc that have merge conflicts that are >> committed... > > ... and which ones are they? You have commit access. Feel free to fix them. :-) Someone change the files and propably knows better which version he/she/it wants. /O