[wp-trac] Re: [WordPress Trac] #4850: Plugged Up by SVN Update; Suspect plugin.php

[WordPress Trac]

#4850: Plugged Up by SVN Update; Suspect plugin.php
----------------------------+-----------------------------------------------
 Reporter:  jcwinnie        |        Owner:  anonymous
     Type:  defect          |       Status:  closed   
 Priority:  normal          |    Milestone:           
Component:  Administration  |      Version:  2.3      
 Severity:  normal          |   Resolution:  invalid  
 Keywords:  Plugin          |  
----------------------------+-----------------------------------------------
Comment (by JeremyVisser):

 There is most likely an SVN conflict that occurred after you ran {{{svn
 up}}}. Run {{{svn st}}}, and look for any conflicts. (If I remember
 correctly, they're marked with '''C'''.)

 If you find any, run {{{svn revert}}} on the file (e.g. {{{svn revert wp-
 includes/plugins.php}}}).

-- 
Ticket URL: <http://trac.wordpress.org/ticket/4850#comment:8>
WordPress Trac <http://trac.wordpress.org/>
WordPress blogging software