[wp-forums] XML Parsing Error

[Scott Merrill]

I'm sure someone knows already, but I just tried to load the forums and 
got this:

XML Parsing Error: not well-formed Location: 
http://wordpress.org/support/ Line Number 6, Column 2:

<<<<<<< .mine
-^

-- 
skippy at skippy.net | http://skippy.net/

gpg --keyserver pgp.mit.edu --recv-keys 9CFA4B35
506C F8BB 17AE 8A05 0B49  3544 476A 7DEC 9CFA 4B35