From c157d3375c8532f5f5f2e178583a01d6ff06a2ef Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Fri, 22 Apr 2011 18:17:08 -0700
Subject: [PATCH] More changes for Bug 9539 - cpu.overprovisioning.factor does
 not work

- After p4merge some weird character was getting added.
---
 server/src/com/cloud/server/ManagementServerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 58f39e9e457..adc631733af 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1,4 +1,4 @@
-/**
+/**
  *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
  * 
  * This software is licensed under the GNU General Public License v3 or later.