That looks like an unresolved merge from a repository update.   In which case the two solutions are go in there and resolve the merge, or nuke the file and check out a fresh copy.

From: charles howard <>
To: General mailing list for gumstix users. <>
Sent: Friday, October 7, 2011 4:41 PM
Subject: [Gumstix-users] Caspa Camera

I am new to the Linux environment and having trouble with a parse error when I attempt bitbake.  Does anyone know a possible solution.  The error is as follows

fim@fim-desktop:~$ bitbake linux-omap3-caspapx
ERROR: Unable to parse conf/bitbake.conf: /home/fim/overo-oe/ unparsed line: '<<<<<<< HEAD'

All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
gumstix-users mailing list