From 444dba6edd98440b1ce6b980c1ea534e46539649 Mon Sep 17 00:00:00 2001
From: Chip Childers <chip.childers@gmail.com>
Date: Mon, 9 Jul 2012 11:49:22 -0400
Subject: [PATCH] Fixed origin merge cleanup error.

---
 server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
index 1b91c05031d..389f8c0ea93 100755
--- a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
@@ -112,4 +112,3 @@ public class VolumeHostDaoImpl extends GenericDaoBase<VolumeHostVO, Long> implem
 	}
 
 }
->>>>>>> f157b702e4c6821fc4af4c27e085dea097b79101