Code review comment for lp:~mattyw/juju-core/gocheck_included_in_build_fix

The conflict means you need to merge trunk again and resolve it, and then
push back to Launchpad. Let us know when you finish and we'll submit it
again.

John
=:->
On Nov 11, 2013 5:29 AM, "Go Bot" <email address hidden> wrote:

> The proposal to merge lp:~mattyw/juju-core/gocheck_included_in_build_fix
> into lp:juju-core has been updated.
>
> Status: Approved => Needs review
>
> For more details, see:
>
> https://code.launchpad.net/~mattyw/juju-core/gocheck_included_in_build_fix/+merge/192411
> --
>
> https://code.launchpad.net/~mattyw/juju-core/gocheck_included_in_build_fix/+merge/192411
> You are reviewing the proposed merge of
> lp:~mattyw/juju-core/gocheck_included_in_build_fix into lp:juju-core.
>