gentoo warriorness # emerge -av xgl

These are the packages that would be merged, in order:

Calculating dependencies  /usr/portage/local/layman/portage-xgl/x11-base/xgl/xgl
-0.0.1_pre20060823.ebuild: line 22: syntax error near unexpected token `<<<'
/usr/portage/local/layman/portage-xgl/x11-base/xgl/xgl-0.0.1_pre20060823.ebuild:
 line 22: `<<<<<<< .mine'

!!! ERROR: x11-base/xgl-0.0.1_pre20060823 failed.
Call stack:
  ebuild.sh, line 1454:   Called die

!!! error sourcing ebuild
!!! If you need support, post the topmost build error, and the call stack if rel                    evant.


aux_get(): (0) Error in x11-base/xgl-0.0.1_pre20060823 ebuild. (1)
               Check for syntax error or corruption in the ebuild. (--debug)

... done!
[ebuild     UD] x11-base/xgl-0.0.1_pre20060714-r1 [0.0.1_pre20060823] USE="ipv6                     -debug -xinerama" 0 kB [3]

Total size of downloads: 0 kB
Portage overlays:
 [1] /usr/local/portage
 [2] /usr/local/portage
 [3] /usr/portage/local/layman/portage-xgl

Would you like to merge these packages? [Yes/No]