CLOUDSTACK-3300: small fix in 4.2 branch again

2013-07-01 06:45:00 -04:00 · 2013-07-01 06:45:00 -04:00 · c814cfbb80
parent 9c4719fca7
commit c814cfbb80
1 changed files with 0 additions and 1 deletions
--- 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>