[wp-testers] Error with media.php

[Andrew Ozz]

After the last merge, several files in Crazyhorse have conflict hooks 
left in. It probably would take few days before all conflicts are resolved.

Until then if you want to try it, get rev 8527:
http://trac.wordpress.org/browser/branches/crazyhorse?rev=8527
unless of course you want to clear some of the merge conflicts :)

Jason Webster wrote:
> Sounds to me like there's either an error in some heredoc syntax, or 
> someone committed an unresolved SVN conflict. I'll look at it.
> 
> 
> Rob Sked wrote:
>> Hi,
>>
>>  
>>
>> I've just downloaded the lastest SVN copy of Wordpress, and when I get 
>> to my
>> dashboard, I'm getting the following error:
>>
>>  
>>
>> Parse error: syntax error, unexpected T_SL in
>> /nfs/c02/h03/mnt/30625/domains/skeddy.net/html/wp-admin/includes/media.php 
>>
>> on line 70
>>
>>  
>>
>> The rest of the site (from a users point of view) works fine.
>>
>>  
>>
>> Rob
>>
>> http://skeddy.net
>>
>> _______________________________________________
>> wp-testers mailing list
>> wp-testers at lists.automattic.com
>> http://lists.automattic.com/mailman/listinfo/wp-testers
>>   
> 
> _______________________________________________
> wp-testers mailing list
> wp-testers at lists.automattic.com
> http://lists.automattic.com/mailman/listinfo/wp-testers
>