[OE-core] [Consolidated & Tested 02/35] meta/conf/local.conf.sample: improve comments/layout

[Phil Blundell]

On Wed, 2011-07-27 at 00:46 -0700, Saul Wold wrote:
>  # There are other application targets too, see meta/classes/core-image.bbclass 
> +<<<<<<< HEAD:meta/conf/local.conf.sample
>  # and meta/packages/tasks/task-core.bb for more details.
>  
>  EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
> +=======
> +# and meta/recipes-core/tasks/task-core.bb for more details.
> +<<<<<<< HEAD:meta-yocto/conf/local.conf.sample
> +# The -sdk image includes these features by default now.
> +EXTRA_IMAGE_FEATURES = "debug-tweaks"
> +=======
> +EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
> +>>>>>>> d82e8ed... meta/conf/local.conf.sample: improve comments/layout:meta/conf/local.conf.sample
> +>>>>>>> 8d50670... meta/conf/local.conf.sample: improve comments/layout:meta-yocto/conf/local.conf.sampl

Er?  That doesn't look like it can be right.  I'm a bit surprised that
you managed to test successfully with those conflict markers in there.

p.