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

[Julian Tenney]

That's what I'd expect, thanks,

-----Original Message-----
From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 29 January 2013 08:12
To: For Xerte technical developers
Subject: [Xerte-dev] Re: Wizard Conflict in SVN (my fault)

I asked, because if I update to the latest SVN, the wizard.fla and wizard.swf are left untouched. That means that my commits are the latests at the moment.

I can send you the txt file with the flash code if you want.

Tom

Op 29-1-2013 8:44, Julian Tenney schreef:
> 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
>
>
>
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
> This message and any attachment are intended solely for the addressee and may contain confidential information. If you have received this message in error, please send it back to me, and immediately delete it.   Please do not use, copy or disclose the information contained in this message or in any attachment.  Any views or opinions expressed by the author of this email do not necessarily reflect the views of the University of Nottingham.
>
> This message has been checked for viruses but the contents of an 
> attachment may still contain software viruses which could damage your computer system:
> you are advised to perform your own checks. Email communications with 
> the University of Nottingham may be monitored as permitted by UK legislation.
>

--
--

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


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