Fixed origin merge cleanup error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/444dba6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/444dba6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/444dba6e Branch: refs/heads/master Commit: 444dba6edd98440b1ce6b980c1ea534e46539649 Parents: 082d563 Author: Chip Childers <[email protected]> Authored: Mon Jul 9 11:49:22 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Mon Jul 9 11:49:22 2012 -0400 ---------------------------------------------------------------------- .../com/cloud/storage/dao/VolumeHostDaoImpl.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/444dba6e/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java index 1b91c05..389f8c0 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
