MAAS

Code review comment for lp:~andreserl/maas/packaging_1.8.1_prep

  1. packaging_1.8.1_prep
  2. Merge into packaging-1.8
Revision history for this message
Christian Reis (kiko) wrote :

On Sun, Jul 26, 2015 at 01:12:27PM -0000, Andres Rodriguez wrote:
> +<<<<<<< TREE
> maas (1.8.1+bzr4019-0ubuntu2) UNRELEASED; urgency=medium
> +=======
> +maas (1.8.1+bzr4027-0ubuntu1) UNRELEASED; urgency=medium

Did you resolve the conflict?
--
Christian Robottom Reis | [+1] 612 888 4935 | http://launchpad.net/~kiko
Canonical VP Hyperscale | [+55 16] 9 9112 6430

« Back to merge proposal