Hi,

As I feared there's 1600+ conflicts when merging the apache-flex-skd-4.10.0 tag 
into master.  Can someone who more experience with Git lend a hand here - it 
seems very strange to me that there would be any conflicts let alone that 
number.

Thanks,
Justin

Reply via email to