[Xerte-dev] Wizard Conflict in SVN (my fault)

[Julian Tenney]

Tom,

Sorry, I'm never 100% I do this bit correctly, but I had changed the wizard over the last couple of days, then you checked in your version, so I had conflicts. I've resolved them, I think, but please check if the files in the svn are the files you checked in today (I didn't make any changes, just some debugging stuff)

Thanks (sorry)

Julian
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20130128/db7fedf9/attachment.html>