diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2013-09-05 13:11:09 +0200 |
|---|---|---|
| committer | Vlastimil Holer <vlastimil.holer@gmail.com> | 2013-09-05 13:11:09 +0200 |
| commit | 744c779182cba32314f8435660a61c2711cb9f54 (patch) | |
| tree | 7871342bf0b122217b51493286bac982313b48da /doc/rtd/topics | |
| parent | 8a2a88e0bb4520eabe99b6686413a548f3d59652 (diff) | |
| parent | 1d27cd75eaaeef7b72f3be77de24da815c82a825 (diff) | |
| download | vyos-cloud-init-744c779182cba32314f8435660a61c2711cb9f54.tar.gz vyos-cloud-init-744c779182cba32314f8435660a61c2711cb9f54.zip | |
Merged trunk lp:cloud-init
Diffstat (limited to 'doc/rtd/topics')
| -rw-r--r-- | doc/rtd/topics/merging.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/rtd/topics/merging.rst b/doc/rtd/topics/merging.rst new file mode 100644 index 00000000..8a03f3c7 --- /dev/null +++ b/doc/rtd/topics/merging.rst @@ -0,0 +1,5 @@ +========= +Merging +========= + +.. include:: ../../merging.rst |