What makes you think that it is in conflict? When I go to the CMS site and click the publish link to get a diff it doesn't show anything about the guide. Note: it might well be possible that I messed up that page but I can't see how I could resolve the issue since I don't even see one...
Uli On 20.05.2011 16:02, Ross Gardler wrote: > On 28/04/2011 22:46, Ross Gardler wrote: >> Whoever last edited the "Guide to being a mentor" on the website has >> left it in a state of conflict - can you please resolve this. > > These pages are still in conflict, can whoever put it in this state please > fix it, it's hard to use > the web based CMS while we have conflicts in place. > > I'll name and shame next time ;-) > > Ross
