Taken with conflict resolution and whitespace fixes.

Thank you,
Alex

On Tue, Mar 24, 2015 at 12:05 PM, Barros Pena, Belen <belen.barros.pena@intel.com> wrote:

On 24/03/2015 11:52, "Michael Wood" <michael.g.wood@intel.com> wrote:

>looks good to me.
>
>Could also use latest documentation link instead here if you wanted.
>It'd be good to add a bit more info to your commit message so we know
>more about what changed.

Done. Here is a v2:

def713a1682544237e27cb5a04f0edf2424e45e2

bitbake: toasterui: small changes to empty states

Thanks!

Belén

>
>Michael
>
>On 23/03/15 18:37, Barros Pena, Belen wrote:
>>
>>http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=bbarrosp/em
>>pt
>> y-states
>>
>> 1346f67cfa3d96a7faa8870a0082a61634fa01df
>> bitbake: toasterui: small changes to empty states
>>
>>
>>
>> Thanks
>>
>> Belén
>>
>
>--
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

--
_______________________________________________
toaster mailing list
toaster@yoctoproject.org
https://lists.yoctoproject.org/listinfo/toaster



--
Alex Damian
Yocto Project
SSG / OTC