Fixed origin merge cleanup error.

2012-07-09 11:49:22 -04:00 · 2012-07-09 11:49:22 -04:00 · 444dba6edd
parent 082d5634d1
commit 444dba6edd
1 changed files with 0 additions and 1 deletions
--- 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