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

[Tom Reijnders]

Will do. The problem with .fla files is that they are binary and svn 
can't really cope with those. That's why I keep .txt files on my local 
disk with all the flash code for these kinds of situations...

Tom

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
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev

-- 
--

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

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