[buddypress-trac] [BuddyPress] #2623: [3232] was a bad merge

[buddypress-trac at lists.automattic.com]

#2623: [3232] was a bad merge
----------------------+-----------------------------------------------------
 Reporter:  mdawaffe  |       Owner:     
     Type:  defect    |      Status:  new
 Priority:  blocker   |   Milestone:  1.3
Component:  Core      |    Keywords:     
----------------------+-----------------------------------------------------
 It looks like [3232] was a bad merge.

 For example,
 http://trac.buddypress.org/browser/trunk/bp-core.php?rev=3232#L40 requires
 a file that does not exist in trunk nor branches/1.2

-- 
Ticket URL: <http://trac.buddypress.org/ticket/2623>
BuddyPress <http://buddypress.org/>
BuddyPress