From d78cea1cea7bfa5d5efd1c9e9a5bc8c2c68c2176 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 15 Feb 2011 17:08:01 -0800
Subject: [PATCH] fix merge conflicts

---
 server/src/com/cloud/api/ApiServlet.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index 24d5b29a423..1332dfe4a19 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -19,6 +19,8 @@
 package com.cloud.api;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;