From 8a9cf04008fbf90d19eee6bdb5d06a1c06fb3734 Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Thu, 3 Jan 2013 10:42:30 -0800
Subject: [PATCH] Fixing the file that was merged incorrectly

---
 .../cloudstack/engine/datacenter/entity/api/ZoneEntity.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java
index ae789ead329..5bf35540085 100755
--- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java
@@ -25,14 +25,14 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.xml.bind.annotation.XmlRootElement;
 
-
+import org.apache.cloudstack.engine.service.api.ProvisioningService;
+import org.apache.cloudstack.framework.ws.jackson.Url;
 /**
  * Describes a zone and operations that can be done in a zone. 
  */
 @Path("/zone/{zoneid}")
 @Produces({"application/json"})
 @XmlRootElement(name="zone")
-@Path("zone/{zone-id}")
 public interface ZoneEntity extends DataCenterResourceEntity {
     @GET
     @Path("/pods")