cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:docs/zstack_fix into cloud-init:master.

Commit message:
docs: Fixes zstack line lengths

Requested reviews:
  cloud-init Commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/374738
-- 
Your team cloud-init Commiters is requested to review the proposed merge of ~powersj/cloud-init:docs/zstack_fix into cloud-init:master.

diff --git a/doc/rtd/topics/datasources/zstack.rst b/doc/rtd/topics/datasources/zstack.rst
index 93a2791..962a4a8 100644
--- a/doc/rtd/topics/datasources/zstack.rst
+++ b/doc/rtd/topics/datasources/zstack.rst
@@ -3,8 +3,13 @@
 ZStack
 ======
 ZStack platform provides a AWS Ec2 metadata service, but with different
+<<<<<<< doc/rtd/topics/datasources/zstack.rst
 datasource identity.
 More information about ZStack can be found at `ZStack <https://www.zstack.io>`__.
+=======
+datasource identity. More information about ZStack can be found at
+`ZStack <https://www.zstack.io>`__.
+>>>>>>> doc/rtd/topics/datasources/zstack.rst
 
 Discovery
 ---------