CLOUDSTACK-3300: small fix in 4.2 branch again
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c814cfbb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c814cfbb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c814cfbb Branch: refs/heads/4.2 Commit: c814cfbb8006c1ac3f09d75509926f32e63c8dff Parents: 9c4719f Author: Sebastien Goasguen <[email protected]> Authored: Mon Jul 1 06:45:00 2013 -0400 Committer: Sebastien Goasguen <[email protected]> Committed: Mon Jul 1 06:45:00 2013 -0400 ---------------------------------------------------------------------- docs/en-US/upload-existing-volume-to-vm.xml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c814cfbb/docs/en-US/upload-existing-volume-to-vm.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml index 2f58a97..3cbfc34 100644 --- a/docs/en-US/upload-existing-volume-to-vm.xml +++ b/docs/en-US/upload-existing-volume-to-vm.xml @@ -109,5 +109,4 @@ Volumes, find the name you specified in step 5, and make sure the status is Uploaded.</para> </listitem> </orderedlist> ->>>>>>> a12a13c... CLOUDSTACK-3300: little fix for doc build </section>
