launchpad-reviewers team mailing list archive

[Simone Pelosi <mp+467717@xxxxxxxxxxxxxxxxxx>]

Simone Pelosi has proposed merging ~pelpsi/launchpad-mojo-specs/+git/private:fetch-service-revision-9 into ~launchpad/launchpad-mojo-specs/+git/private:master.

Commit message:
lp-fetch-service: bump fetch-service revision to 9


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/467717
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad-mojo-specs/+git/private:fetch-service-revision-9 into ~launchpad/launchpad-mojo-specs/+git/private:master.

diff --git a/lp-fetch-service/bundle.yaml b/lp-fetch-service/bundle.yaml
index 9f0d417..46fe648 100644
--- a/lp-fetch-service/bundle.yaml
+++ b/lp-fetch-service/bundle.yaml
@@ -14,7 +14,11 @@ applications:
   fetch-service:
     charm: ch:fetch-service
     channel: edge
+<<<<<<< lp-fetch-service/bundle.yaml
     revision: 7
+=======
+    revision: 8
+>>>>>>> lp-fetch-service/bundle.yaml
     num_units: 1
     expose: true
     options: