On Friday 20 October 2006 19:31, Sean O'Hara wrote: > There are seems to be all kinds of weird illegal characters in the > build.xml file in trunk... lots of "===============" and '<<<<<<< > .mine' that can't compile. Does anyone know why these have been added?
These are SVN merge markers... You seem to change server files that other people changed before you update. Check what is right and remove other sections then mark file as resolved -- novemberain.com | flexwiki.novemberain.com | rubyonrails.ru | osflash.org/red5 _______________________________________________ Red5 mailing list [email protected] http://osflash.org/mailman/listinfo/red5_osflash.org
