From c814cfbb8006c1ac3f09d75509926f32e63c8dff Mon Sep 17 00:00:00 2001
From: Sebastien Goasguen <runseb@gmail.com>
Date: Mon, 1 Jul 2013 06:45:00 -0400
Subject: [PATCH] CLOUDSTACK-3300: small fix in 4.2 branch again

---
 docs/en-US/upload-existing-volume-to-vm.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml
index 2f58a97423e..3cbfc343125 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>