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

[Julian Tenney]

yes, that's the source for these
________________________________________
From: xerte-dev-bounces at lists.nottingham.ac.uk [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders [reijnders at tor.nl]
Sent: 28 January 2013 17:47
To: For Xerte technical developers
Subject: [Xerte-dev] Re: Wizard Conflict in SVN (my fault)

Xerte, not xot right?

Op 28-1-2013 17:41, Julian Tenney schreef:
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






_______________________________________________
Xerte-dev mailing list
Xerte-dev at lists.nottingham.ac.uk<mailto:Xerte-dev at lists.nottingham.ac.uk>
http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev



--
--

Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196