On 9/24/06, Hisashi T Fujinaka <htodd at twofifty.com> wrote: > I'm no good at svn, but I ended up with merge errors in > wp-includes/default-filters.php > I also got merge errors. Please advise. -Doug